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

LICENSE MIT

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

(cherry picked from commit a824cbda621151c34dd85d00c3ee2779d839c237)

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