Silly me: Reverted last change. The code here is actually okay but

when driving the one for gnupg, the bug was probably introduced.

diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index c0c66a5a0fe02598fccbd6f7c8d861bd4861d231..2966d6be05d16b8ea79e6886ce20bd415fb65b10 100644 (file)
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,7 +1,3 @@
-2003-11-13  Werner Koch  <wk@gnupg.org>
-
-       * vasprintf.c (int_vasprintf): ARGS should not be a pointer.
-
 2003-10-31  Werner Koch  <wk@gnupg.org>
 
        * keylist.c (parse_timestamp): Detect ISO 8601 timestamps and try

diff --git a/gpgme/vasprintf.c b/gpgme/vasprintf.c
index d8275f65a5949aa96db7f2ab31f44ac7ec4da61e..77113a310e727eee8b8aa980b36c4bc6e68180c6 100644 (file)
--- a/gpgme/vasprintf.c
+++ b/gpgme/vasprintf.c
@@ -43,13 +43,13 @@ Boston, MA 02111-1307, USA.  */
 int global_total_width;
 #endif
 
-static int int_vasprintf (char **, const char *, va_list);
+static int int_vasprintf (char **, const char *, va_list *);
 
 static int
 int_vasprintf (result, format, args)
      char **result;
      const char *format;
-     va_list args;
+     va_list *args;
 {
   const char *p = format;
   /* Add one to make sure that it is never zero, which might cause malloc
@@ -57,7 +57,7 @@ int_vasprintf (result, format, args)
   int total_width = strlen (format) + 1;
   va_list ap;
 
-  va_copy (ap, args);
+  va_copy (ap, *args);
 
   while (*p != '\0')
     {
@@ -130,7 +130,7 @@ int_vasprintf (result, format, args)
 #endif
   *result = malloc (total_width);
   if (*result != NULL)
-    return vsprintf (*result, format, args);
+    return vsprintf (*result, format, *args);
   else
     return 0;
 }