From: Hans-Werner Paulsen <hans@MPA-Garching.MPG.DE>
Date: Wed, 22 Jul 2009 13:14:33 +0000 (+0200)
Subject: avoid call to rxi_FreePacket with NULL pointer
X-Git-Tag: openafs-stable-1_4_12pre1~65
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f574340c07be4c5f11eb90fa51473733b786b3db;p=packages%2Fo%2Fopenafs.git

avoid call to rxi_FreePacket with NULL pointer

the function rx_ReadProc32 (src/rx/rx_rdwr.c) checks the pointer
call->currentPacket before the function rxi_FreePacket is called. This
test was missing in the function rx_ReadProc.

FIXES 125110

Reviewed-on: http://gerrit.openafs.org/http://gerrit.openafs.org/178
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
(cherry picked from commit e35dfdcce9d11607669783844331ad2dbafd2793)
Change-Id: I1156403dc3d7e64d4176577e51933b79b00442db
Reviewed-on: http://gerrit.openafs.org/935
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/rx/rx_rdwr.c b/src/rx/rx_rdwr.c
index 6fc74c85f..28984271e 100644
--- a/src/rx/rx_rdwr.c
+++ b/src/rx/rx_rdwr.c
@@ -322,7 +322,7 @@ rx_ReadProc(struct rx_call *call, char *buf, int nbytes)
 	call->curlen = tcurlen - nbytes;
 	call->nLeft = tnLeft - nbytes;
 
-        if (!call->nLeft) {
+        if (!call->nLeft && call->currentPacket != NULL) {
             /* out of packet.  Get another one. */
             NETPRI;
             MUTEX_ENTER(&call->lock);