changeset 23569:a2f06797a1b0

merge of '0cbcb7f910c95c3dac3f06c404e29dcc8b709419' and 'd6d2e0024c0c5f5f7b447551d746d165e2b58a8d'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 12 Jul 2008 07:29:56 +0000
parents 9fa6ce44149f (diff) a0e957b7b923 (current diff)
children 5dafc77b169e
files libpurple/protocols/msn/soap2.c libpurple/protocols/msn/soap2.h libpurple/protocols/qq/qq_proxy.c libpurple/protocols/qq/qq_proxy.h libpurple/protocols/qq/recv_core.c libpurple/protocols/qq/recv_core.h libpurple/protocols/qq/send_core.c libpurple/protocols/qq/send_core.h libpurple/protocols/qq/sendqueue.c libpurple/protocols/qq/sendqueue.h libpurple/protocols/qq/udp_proxy_s5.c libpurple/protocols/qq/udp_proxy_s5.h
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msnp9/command.c	Sat Jul 12 06:44:19 2008 +0000
+++ b/libpurple/protocols/msnp9/command.c	Sat Jul 12 07:29:56 2008 +0000
@@ -65,9 +65,12 @@
 		for (c = 0; cmd->params[c]; c++);
 		cmd->param_count = c;
 
-		param = cmd->params[0];
-
-		cmd->trId = is_num(param) ? atoi(param) : 0;
+		if (cmd->param_count) {
+			char *param = cmd->params[0];
+			cmd->trId = is_num(param) ? atoi(param) : 0;
+		} else {
+			cmd->trId = 0;
+		}
 	}
 	else
 		cmd->trId = 0;