aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2003-11-13 07:37:18 +0000
committerWerner Koch <[email protected]>2003-11-13 07:37:18 +0000
commit53272a25fc0ae7098a2cd1e7eab550ce080438a7 (patch)
tree182ce80f54ce71079bcd5cff5a9375e4e79fc708
parentMainly changes to adjust for the changed KSBA API. (diff)
downloadgnupg-53272a25fc0ae7098a2cd1e7eab550ce080438a7.tar.gz
gnupg-53272a25fc0ae7098a2cd1e7eab550ce080438a7.zip
(vasprintf): ARGS should not be a pointer. Fixed
segv on Solaris. Reported by Andrew J. Schorr.
-rw-r--r--THANKS2
-rw-r--r--common/ChangeLog5
-rw-r--r--common/vasprintf.c4
3 files changed, 9 insertions, 2 deletions
diff --git a/THANKS b/THANKS
index 9047c1c18..e6cac5b9c 100644
--- a/THANKS
+++ b/THANKS
@@ -1,3 +1,5 @@
Richard Lefebvre [email protected]
+Andrew J. Schorr [email protected]
+
diff --git a/common/ChangeLog b/common/ChangeLog
index 2eaa954b9..1c63b5248 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-13 Werner Koch <[email protected]>
+
+ * vasprintf.c (vasprintf): ARGS should not be a pointer. Fixed
+ segv on Solaris. Reported by Andrew J. Schorr.
+
2003-11-12 Werner Koch <[email protected]>
* maperror.c (map_ksba_err, map_gcry_err, map_kbx_err): Removed.
diff --git a/common/vasprintf.c b/common/vasprintf.c
index 2af2d3a20..9efea33f2 100644
--- a/common/vasprintf.c
+++ b/common/vasprintf.c
@@ -31,7 +31,7 @@ int global_total_width;
#endif
int
-vasprintf (char **result, const char *format, va_list *args)
+vasprintf (char **result, const char *format, va_list args)
{
const char *p = format;
/* Add one to make sure that it is never zero, which might cause malloc
@@ -120,7 +120,7 @@ vasprintf (char **result, const char *format, va_list *args)
#endif
*result = malloc (total_width);
if (*result != NULL)
- return vsprintf (*result, format, *args);
+ return vsprintf (*result, format, args);
else
return 0;
}