pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [17213] trunk/libgaim/protocols/msn/notification.c

[<rl...@us...>]

Revision: 17213
          http://svn.sourceforge.net/gaim/?rev=17213&view=rev
Author:   rlaager
Date:     2006-09-09 19:09:45 -0700 (Sat, 09 Sep 2006)

Log Message:
-----------
Correction from wabz on his previous patch.

Modified Paths:
--------------
    trunk/libgaim/protocols/msn/notification.c

Modified: trunk/libgaim/protocols/msn/notification.c
===================================================================
--- trunk/libgaim/protocols/msn/notification.c	2006-09-10 00:17:44 UTC (rev 17212)
+++ trunk/libgaim/protocols/msn/notification.c	2006-09-10 02:09:45 UTC (rev 17213)
@@ -677,7 +677,7 @@
 	user = msn_userlist_find_user(session->userlist, passport);
 
 	old_friendly = msn_user_get_friendly_name(user);
-	if (old_friendly && strcmp(old_friendly, friendly))
+	if (!old_friendly || (old_friendly && strcmp(old_friendly, friendly)))
 	{
 		serv_got_alias(gc, passport, friendly);
 		msn_user_set_friendly_name(user, friendly);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17329] trunk/libgaim/protocols/msn/notification.c

[<nos...@us...>]

Revision: 17329
          http://svn.sourceforge.net/gaim/?rev=17329&view=rev
Author:   nosnilmot
Date:     2006-09-20 04:52:35 -0700 (Wed, 20 Sep 2006)

Log Message:
-----------
Fix some more potential printf("%s", NULL) crashes due to changes in the
passport info MSN provides when signing in. This might break email
notifications for such cases, but that's better than crashing, right?

Modified Paths:
--------------
    trunk/libgaim/protocols/msn/notification.c

Modified: trunk/libgaim/protocols/msn/notification.c
===================================================================
--- trunk/libgaim/protocols/msn/notification.c	2006-09-20 11:49:38 UTC (rev 17328)
+++ trunk/libgaim/protocols/msn/notification.c	2006-09-20 11:52:35 UTC (rev 17329)
@@ -999,17 +999,20 @@
 				gaim_account_get_username(account));
 		fprintf(fd, "<input type=\"hidden\" name=\"username\" value=\"%s\">\n",
 				gaim_account_get_username(account));
-		fprintf(fd, "<input type=\"hidden\" name=\"sid\" value=\"%s\">\n",
-				session->passport_info.sid);
-		fprintf(fd, "<input type=\"hidden\" name=\"kv\" value=\"%s\">\n",
-				session->passport_info.kv);
+		if (session->passport_info.sid != NULL)
+			fprintf(fd, "<input type=\"hidden\" name=\"sid\" value=\"%s\">\n",
+					session->passport_info.sid);
+		if (session->passport_info.kv != NULL)
+			fprintf(fd, "<input type=\"hidden\" name=\"kv\" value=\"%s\">\n",
+					session->passport_info.kv);
 		fprintf(fd, "<input type=\"hidden\" name=\"id\" value=\"2\">\n");
 		fprintf(fd, "<input type=\"hidden\" name=\"sl\" value=\"%ld\">\n",
 				time(NULL) - session->passport_info.sl);
 		fprintf(fd, "<input type=\"hidden\" name=\"rru\" value=\"%s\">\n",
 				rru);
-		fprintf(fd, "<input type=\"hidden\" name=\"auth\" value=\"%s\">\n",
-				session->passport_info.mspauth);
+		if (session->passport_info.mspauth != NULL)
+			fprintf(fd, "<input type=\"hidden\" name=\"auth\" value=\"%s\">\n",
+					session->passport_info.mspauth);
 		fprintf(fd, "<input type=\"hidden\" name=\"creds\" value=\"%s\">\n",
 				sendbuf); /* TODO Digest me (huh? -- ChipX86) */
 		fprintf(fd, "<input type=\"hidden\" name=\"svc\" value=\"mail\">\n");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.