callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug in get_length_upper_bound where g_print-ing a NULL string would cause a segfault

Browse Source
This commit is contained in:
Elliot Lee
1998-01-01 22:48:18 +00:00
parent e2f5eb1c3e
commit f7443e0e85
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
glib/gstring.c
View File

@ -322,6 +322,7 @@ get_length_upper_bound (gchar* fmt, va_list *args)
int short_int; int short_int;
int long_int; int long_int;
int done; int done;
char *tmp;
while (*fmt) while (*fmt)
{ {
@ -362,7 +363,11 @@ get_length_upper_bound (gchar* fmt, va_list *args)
/* I ignore 'q' and 'L', they're not portable anyway. */ /* I ignore 'q' and 'L', they're not portable anyway. */
case 's': case 's':
len += strlen (va_arg (*args, char *)); tmp = va_arg(*args, char *);
if(tmp)
len += strlen (tmp);
else
len += strlen ("(null)");
done = TRUE; done = TRUE;
break; break;
case 'd': case 'd':