Mercurial > pidgin

changeset 13595:e9289db48a5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15981] Fix some bugs. I don't understand why I don't get "might be used uninitialized" warnings when I compile on my machine. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Fri, 07 Apr 2006 14:13:44 +0000
parents 893ef02b6e28
children 849e80570b90
files src/protocols/oscar/family_admin.c src/protocols/oscar/oscar.c src/protocols/oscar/peer_proxy.c
diffstat 3 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/oscar/family_admin.c	Fri Apr 07 05:14:16 2006 +0000
+++ b/src/protocols/oscar/family_admin.c	Fri Apr 07 14:13:44 2006 +0000
@@ -182,7 +182,7 @@
 	aim_snacid_t snacid;
 	aim_tlvlist_t *tl = NULL;
 
-	flap_frame_new(od, 0x02, 10+2+2+strlen(newemail));
+	fr = flap_frame_new(od, 0x02, 10+2+2+strlen(newemail));
 
 	snacid = aim_cachesnac(od, 0x0007, 0x0004, 0x0000, NULL, 0);
 	aim_putsnac(&fr->data, 0x0007, 0x0004, 0x0000, snacid);
--- a/src/protocols/oscar/oscar.c	Fri Apr 07 05:14:16 2006 +0000
+++ b/src/protocols/oscar/oscar.c	Fri Apr 07 14:13:44 2006 +0000
@@ -1623,7 +1623,7 @@
 	separator = strchr(redir->ip, ':');
 	if (separator != NULL)
 	{
-		host = g_strndup(redir->ip, (int)separator - (int)host);
+		host = g_strndup(redir->ip, (int)separator - (int)redir->ip);
 		port = atoi(separator + 1);
 	}
 	else
--- a/src/protocols/oscar/peer_proxy.c	Fri Apr 07 05:14:16 2006 +0000
+++ b/src/protocols/oscar/peer_proxy.c	Fri Apr 07 14:13:44 2006 +0000
@@ -304,10 +304,11 @@
 			peer_connection_trynext(conn);
 			return;
 		}
+
+		frame->payload.offset += read;
 	}
 
 	conn->lastactivity = time(NULL);
-	frame->payload.offset += read;
 	if (frame->payload.offset < frame->payload.len)
 		/* Waiting for more data to arrive */
 		return;