[gaim-migrate @ 9594]

Tue, 27 Apr 2004 02:33:29 +0000

author
Daniel Atallah <datallah@pidgin.im>
date
Tue, 27 Apr 2004 02:33:29 +0000
changeset 8830
cad4b48d0620
parent 8829
1061aa1da2b3
child 8831
060f87f65f48

[gaim-migrate @ 9594]
Patch by Daniel Atallah to prevent passing NULL to a vsprintf, which was
causing gaim to exit (but not crash, for some reason).

committer: Christian Hammond <chipx86@chipx86.com>

src/protocols/msn/cmdproc.c file | annotate | diff | comparison | revisions
--- a/src/protocols/msn/cmdproc.c	Tue Apr 27 02:12:08 2004 +0000
+++ b/src/protocols/msn/cmdproc.c	Tue Apr 27 02:33:29 2004 +0000
@@ -158,7 +158,7 @@
 {
 	MsnServConn *servconn;
 	char *data;
-	char *params;
+	char *params = NULL;
 	va_list arg;
 	size_t len;
 
@@ -167,9 +167,11 @@
 
 	servconn = cmdproc->servconn;
 
-	va_start(arg, format);
-	params = g_strdup_vprintf(format, arg);
-	va_end(arg);
+	if (format != NULL) {
+		va_start(arg, format);
+		params = g_strdup_vprintf(format, arg);
+		va_end(arg);
+	}
 
 	if (params != NULL)
 		data = g_strdup_printf("%s %s\r\n", command, params);
@@ -201,9 +203,11 @@
 
 	trans->command = g_strdup(command);
 
-	va_start(arg, format);
-	trans->params = g_strdup_vprintf(format, arg);
-	va_end(arg);
+	if (format != NULL) {
+		va_start(arg, format);
+		trans->params = g_strdup_vprintf(format, arg);
+		va_end(arg);
+	}
 
 	msn_cmdproc_send_trans(cmdproc, trans);
 }

mercurial