X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=unix%2Fuxagentc.c;h=5734a7b0ea62c9f545b3cdb70b357d2f4682d871;hb=f004bcca17a789356c32527a396b68b71a773db2;hp=3605c60124316947ab346975086eccf463fb1cd3;hpb=86eac20abb7e5b46a2ff31d1b97baea0f9ba771a;p=PuTTY.git

diff --git a/unix/uxagentc.c b/unix/uxagentc.c
index 3605c601..5734a7b0 100644
--- a/unix/uxagentc.c
+++ b/unix/uxagentc.c
@@ -17,7 +17,8 @@
 
 int agent_exists(void)
 {
-    if (getenv("SSH_AUTH_SOCK") != NULL)
+    const char *p = getenv("SSH_AUTH_SOCK");
+    if (p && *p)
 	return TRUE;
     return FALSE;
 }
@@ -74,13 +75,12 @@ static int agent_select_result(int fd, int event)
     }
     conn->retlen += ret;
     if (conn->retsize == 4 && conn->retlen == 4) {
-	conn->retsize = GET_32BIT(conn->retbuf);
+	conn->retsize = toint(GET_32BIT(conn->retbuf) + 4);
 	if (conn->retsize <= 0) {
 	    conn->retbuf = NULL;
 	    conn->retlen = 0;
 	    goto done;
 	}
-	conn->retsize += 4;
 	assert(conn->retbuf == conn->sizebuf);
 	conn->retbuf = snewn(conn->retsize, char);
 	memcpy(conn->retbuf, conn->sizebuf, 4);