Silly me: Reverted last change. The code here is actually okay but
when driving the one for gnupg, the bug was probably introduced.
This commit is contained in:
parent
c2740411a9
commit
23a2e04133
@ -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
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user