diff src/proxy.c @ 13786:5ddde4ad1ca2

[gaim-migrate @ 16198] Fix some places where a closed socket isn't being dealt with correctly. This may be the cause of the high CPU usage that some people have noticed. Most of these were reported by Eduardo P?rez. committer: Tailor Script <[e-mail]>

--- a/src/proxy.c	Wed May 24 17:38:42 2006 +0000
+++ b/src/proxy.c	Fri May 26 03:26:03 2006 +0000
@@ -1119,7 +1119,7 @@
 	len = read(source, p, max_read);
 	if(len < 0 && errno == EAGAIN)
 		return;
-	else if(len < 0) {
+	else if(len <= 0) {
 		close(source);
 		source = -1;
 		g_free(phb->read_buffer);
@@ -1508,7 +1508,7 @@
 
 	len = read(source, buf, max_read);
 
-	if ((len < 0 && errno == EAGAIN) || len + phb->read_len < 4)
+	if ((len < 0 && errno == EAGAIN) || (len > 0 && len + phb->read_len < 4))
 		return;
 	else if (len + phb->read_len >= 4) {
 		if (phb->read_buffer[1] == 90) {
@@ -1663,7 +1663,7 @@
 	len = read(source, dest, (phb->read_buf_len - phb->read_len));
 	if(len < 0 && errno == EAGAIN)
 		return;
-	else if(len < 0) {
+	else if(len <= 0) {
 		gaim_debug_warning("socks5 proxy", "or not...\n");
 		close(source);
 		gaim_input_remove(phb->inpa);
@@ -1775,7 +1775,7 @@
 		phb->read_buf_len - phb->read_len);
 	if(len < 0 && errno == EAGAIN)
 		return;
-	else if(len < 0) {
+	else if(len <= 0) {
 		close(source);
 		gaim_input_remove(phb->inpa);
 		g_free(phb->read_buffer);
@@ -1867,7 +1867,7 @@
 
 	if(len < 0 && errno == EAGAIN)
 		return;
-	else if(len < 0) {
+	else if(len <= 0) {
 		close(source);
 		gaim_input_remove(phb->inpa);
 		g_free(phb->read_buffer);
@@ -1994,7 +1994,7 @@
 		phb->read_buf_len - phb->read_len);
 	if(len < 0 && errno == EAGAIN)
 		return;
-	else if(len < 0) {
+	else if(len <= 0) {
 		close(source);
 		gaim_input_remove(phb->inpa);
 		g_free(phb->read_buffer);