From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sun, 26 Oct 2008 21:16:57 +0000 (+0000)
Subject: rx-rdwr-avoid-free-null-packet-20081026
X-Git-Tag: openafs-stable-1_4_12pre1~80
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=15c81df56e91879bea43e5c20f1eddc71fe58d44;p=packages%2Fo%2Fopenafs.git

rx-rdwr-avoid-free-null-packet-20081026

LICENSE MIT

avoid a potential call to rxi_FreePacket with a NULL pointer as input

Change-Id: Id18712f44779dd4e26215049e74d55a0d68d1409
Reviewed-on: http://gerrit.openafs.org/920
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c
index 8f8e8ba9a..6fc74c85f 100644
--- a/src/rx/rx_rdwr.c
+++ b/src/rx/rx_rdwr.c
@@ -379,9 +379,9 @@ rx_ReadProc32(struct rx_call *call, afs_int32 * value)
 	    memcpy((char *)value, tcurpos, sizeof(afs_int32));
 	}
 	call->curpos = tcurpos + sizeof(afs_int32);
-	call->curlen = tcurlen - sizeof(afs_int32);
-	call->nLeft = tnLeft - sizeof(afs_int32);
-        if (!call->nLeft) {
+	call->curlen = (u_short)(tcurlen - sizeof(afs_int32));
+	call->nLeft = (u_short)(tnLeft - sizeof(afs_int32));
+        if (!call->nLeft && call->currentPacket != NULL) {
             /* out of packet.  Get another one. */
             NETPRI;
             MUTEX_ENTER(&call->lock);