rpms/gaim/devel gaim-1.4.0-aim-login.crash.patch, NONE, 1.1 gaim.spec, 1.88, 1.89

[fedora-cvs-commits redhat com]

Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31486

Modified Files:
	gaim.spec 
Added Files:
	gaim-1.4.0-aim-login.crash.patch 
Log Message:
148: AIM login crash fix


gaim-1.4.0-aim-login.crash.patch:
 ssi.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE gaim-1.4.0-aim-login.crash.patch ---
http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/protocols/oscar/ssi.c?r1=1.60.2.1&r2=1.60.2.3&diff_format=u

===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ssi.c,v
retrieving revision 1.60.2.1
retrieving revision 1.60.2.3
diff -u -r1.60.2.1 -r1.60.2.3
--- gaim/gaim/src/protocols/oscar/ssi.c	2005/06/14 00:24:29	1.60.2.1
+++ gaim/gaim/src/protocols/oscar/ssi.c	2005/07/09 18:51:05	1.60.2.3
@@ -671,20 +671,18 @@
 	/* Make sure there aren't any duplicate buddies in a group, or duplicate permits or denies */
 	cur = sess->ssi.local;
 	while (cur) {
-		next = cur->next;
-
 		if ((cur->type == AIM_SSI_TYPE_BUDDY) || (cur->type == AIM_SSI_TYPE_PERMIT) || (cur->type == AIM_SSI_TYPE_DENY))
 		{
 			struct aim_ssi_item *cur2, *next2;
-			cur2 = next;
+			cur2 = cur->next;
 			while (cur2) {
 				next2 = cur2->next;
-				if ((cur->type == cur2->type) && (cur->gid == cur2->gid) && (!strcmp(cur->name, cur2->name)))
+				if ((cur->type == cur2->type) && (cur->gid == cur2->gid) && (cur->name != NULL) && (cur2->name != NULL) && (!strcmp(cur->name, cur2->name)))
 					aim_ssi_itemlist_del(&sess->ssi.local, cur2);
 				cur2 = next2;
 			}
 		}
-		cur = next;
+		cur = cur->next;
 	}
 
 	/* Check if there are empty groups and delete them */


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- gaim.spec	8 Jul 2005 04:34:40 -0000	1.88
+++ gaim.spec	11 Jul 2005 09:24:10 -0000	1.89
@@ -13,7 +13,7 @@
 
 Name:		gaim
 Version:	1.4.0
-Release:	1.fc5
+Release:	2.fc5
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -43,7 +43,7 @@
 Patch6:		gaim-1.0.1-naive-gnome-check.patch
 
 ## Patches 100-199: Upstream CVS Backports
-#Patch147:	gaim-1.2.1-dnd-url-crash.patch
+Patch148:       gaim-1.4.0-aim-login.crash.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -109,7 +109,7 @@
 %patch6 -p1
 
 # CVS backports go here
-#%patch147 -p2
+%patch148 -p2
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}/%{version}-%{release}/g" configure
@@ -199,6 +199,9 @@
 %endif
 
 %changelog
+* Sun Jul 10 2005 Warren Togami <wtogami redhat com  1:1.4.0-2
+- 148: AIM login crash fix
+
 * Thu Jul 07 2005 Warren Togami <wtogami redhat com> 1:1.4.0-1
 - 1.4.0