]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
avoid call to rxi_FreePacket with NULL pointer
authorHans-Werner Paulsen <hans@MPA-Garching.MPG.DE>
Wed, 22 Jul 2009 13:14:33 +0000 (15:14 +0200)
committerDerrick Brashear <shadow|account-1000005@unknown>
Thu, 17 Dec 2009 06:32:22 +0000 (22:32 -0800)
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>
src/rx/rx_rdwr.c

index 6fc74c85f2754511111ab65edc0bc4165226682e..28984271ec2ac89ae07cdcea34667e9ffc776331 100644 (file)
@@ -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);