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 8f8e8ba9a940224f358b93cd95521f6fbd5c3aab..6fc74c85f2754511111ab65edc0bc4165226682e 100644 (file)
--- 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);