* vasprintf.c (int_vasprintf): Hack to handle NULL passed for %s.

This commit is contained in:
Werner Koch 2002-08-20 11:59:38 +00:00
parent 4c7d357bce
commit 009390ddb1
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,7 @@
2002-08-20 Werner Koch <wk@gnupg.org>
* vasprintf.c (int_vasprintf): Hack to handle NULL passed for %s.
2002-08-20 Marcus Brinkmann <marcus@g10code.de> 2002-08-20 Marcus Brinkmann <marcus@g10code.de>
* gpgme.c (_gpgme_set_op_info): Append data on subsequent calls. * gpgme.c (_gpgme_set_op_info): Append data on subsequent calls.

View File

@ -97,7 +97,13 @@ int_vasprintf (result, format, args)
total_width += 307; total_width += 307;
break; break;
case 's': case 's':
total_width += strlen (va_arg (ap, char *)); {
char *tmp = va_arg (ap, char *);
if (tmp)
total_width += strlen (tmp);
else /* in case the vsprintf does prints a text */
total_width += 25; /* e.g. "(null pointer reference)" */
}
break; break;
case 'p': case 'p':
case 'n': case 'n':