[Gaim-commits] CVS: gaim/src gtkft.c,1.22,1.23

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18414/src

Modified Files:
	gtkft.c 
Log Message:
Taso N. Devetzis (devetzis) writes:
"0th element of newly-initialised labels[] array has
NULL desc member in gtkft.c:make_info_table(), causing
SEGV in subsequent g_snprintf(). [Was] Reproducible via
"Tools->File Transfers". Patch generated against CVS."



Index: gtkft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkft.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- gtkft.c	11 Mar 2003 22:55:52 -0000	1.22
+++ gtkft.c	26 Mar 2003 02:57:17 -0000	1.23
@@ -510,7 +510,8 @@
 		GtkWidget *label;
 		char buf[256];
 
-		g_snprintf(buf, sizeof(buf), "<b>%s</b>", labels[i].desc);
+		g_snprintf(buf, sizeof(buf), "<b>%s</b>",
+			   labels[i].desc != NULL ? labels[i].desc : "");
 
 		*labels[i].desc_label = label = gtk_label_new(NULL);
 		gtk_label_set_markup(GTK_LABEL(label), buf);