[Gaim-commits] CVS: gaim/src proxy.c,1.130,1.131

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

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25573

Modified Files:
	proxy.c 
Log Message:
Fix bug 1200218 - crash when socks5 password is empty


Index: proxy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/proxy.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -p -r1.130 -r1.131
--- proxy.c	21 Mar 2005 02:14:46 -0000	1.130
+++ proxy.c	14 May 2005 13:20:37 -0000	1.131
@@ -1576,9 +1576,13 @@ s5_canread(gpointer data, gint source, G
 
 	if (buf[1] == 0x02) {
 		unsigned int i, j;
+		const char *u, *p;
 
-		i = strlen(gaim_proxy_info_get_username(phb->gpi));
-		j = strlen(gaim_proxy_info_get_password(phb->gpi));
+		u = gaim_proxy_info_get_username(phb->gpi);
+		p = gaim_proxy_info_get_password(phb->gpi);
+
+		i = (u == NULL) ? 0 : strlen(u);
+		j = (p == NULL) ? 0 : strlen(p);
 
 		buf[0] = 0x01;	/* version 1 */
 		buf[1] = i;