From: Simon Tatham <anakin@pobox.com>
Date: Tue, 28 Dec 2004 17:12:20 +0000 (+0000)
Subject: The latest unfix.org IPv6 patch contains these apparently
X-Git-Tag: 0.58~277
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6120d91507677e7c4a0c057671b3e56435a163f3;p=PuTTY.git

The latest unfix.org IPv6 patch contains these apparently
IPv6-unrelated changes, which convert ints into unsigned in a few
key places in ssh.c. Looks harmless at worst, possibly terribly
useful, so I think we'll have these no matter what the real IPv6
stuff is up to!

[originally from svn r5038]
---

diff --git a/ssh.c b/ssh.c
index 3f37c649..de768d3d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -4185,7 +4185,7 @@ static void ssh1_msg_channel_data(Ssh ssh, struct Packet *pktin)
     /* Data sent down one of our channels. */
     int i = ssh_pkt_getuint32(pktin);
     char *p;
-    int len;
+    unsigned int len;
     struct ssh_channel *c;
 
     ssh_pkt_getstring(pktin, &p, &len);
@@ -4204,7 +4204,7 @@ static void ssh1_msg_channel_data(Ssh ssh, struct Packet *pktin)
 	    /* Data for an agent message. Buffer it. */
 	    while (len > 0) {
 		if (c->u.a.lensofar < 4) {
-		    int l = min(4 - c->u.a.lensofar, len);
+		    unsigned int l = min(4 - c->u.a.lensofar, len);
 		    memcpy(c->u.a.msglen + c->u.a.lensofar, p,
 			   l);
 		    p += l;
@@ -4219,7 +4219,7 @@ static void ssh1_msg_channel_data(Ssh ssh, struct Packet *pktin)
 		    memcpy(c->u.a.message, c->u.a.msglen, 4);
 		}
 		if (c->u.a.lensofar >= 4 && len > 0) {
-		    int l =
+		    unsigned int l =
 			min(c->u.a.totallen - c->u.a.lensofar,
 			    len);
 		    memcpy(c->u.a.message + c->u.a.lensofar, p,
@@ -5335,7 +5335,7 @@ static void ssh2_msg_channel_window_adjust(Ssh ssh, struct Packet *pktin)
 static void ssh2_msg_channel_data(Ssh ssh, struct Packet *pktin)
 {
     char *data;
-    int length;
+    unsigned int length;
     unsigned i = ssh_pkt_getuint32(pktin);
     struct ssh_channel *c;
     c = find234(ssh->channels, &i, ssh_channelfind);
@@ -5364,7 +5364,7 @@ static void ssh2_msg_channel_data(Ssh ssh, struct Packet *pktin)
 	  case CHAN_AGENT:
 	    while (length > 0) {
 		if (c->u.a.lensofar < 4) {
-		    int l = min(4 - c->u.a.lensofar, length);
+		    unsigned int l = min(4 - c->u.a.lensofar, length);
 		    memcpy(c->u.a.msglen + c->u.a.lensofar,
 			   data, l);
 		    data += l;
@@ -5379,7 +5379,7 @@ static void ssh2_msg_channel_data(Ssh ssh, struct Packet *pktin)
 		    memcpy(c->u.a.message, c->u.a.msglen, 4);
 		}
 		if (c->u.a.lensofar >= 4 && length > 0) {
-		    int l =
+		    unsigned int l =
 			min(c->u.a.totallen - c->u.a.lensofar,
 			    length);
 		    memcpy(c->u.a.message + c->u.a.lensofar,