summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstantine Sapuntzakis <csapuntz@cvs.openbsd.org>2002-08-01 22:38:45 +0000
committerConstantine Sapuntzakis <csapuntz@cvs.openbsd.org>2002-08-01 22:38:45 +0000
commitd607710e1baead479461165583cc6d1542aa95e5 (patch)
tree75433b1b2d92811062e137879ad2dfd5bfd15219
parent78c269887e2d77c1fd8cc51df19a01a097b47eeb (diff)
Fix handling of 0-length RPC fragments
-rw-r--r--sys/nfs/nfs_socket.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 93a498ac48b..8369f4811ef 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_socket.c,v 1.30 2002/07/30 19:00:43 csapuntz Exp $ */
+/* $OpenBSD: nfs_socket.c,v 1.31 2002/08/01 22:38:44 csapuntz Exp $ */
/* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */
/*
@@ -1864,7 +1864,7 @@ nfsrv_getstream(slp, waitflag)
struct mbuf *m, **mpp;
char *cp1, *cp2;
int len;
- struct mbuf *om, *m2, *recm = NULL;
+ struct mbuf *om, *m2, *recm;
u_int32_t recmark;
if (slp->ns_flag & SLP_GETSTREAM)
@@ -1910,6 +1910,7 @@ nfsrv_getstream(slp, waitflag)
/*
* Now get the record part.
*/
+ recm = NULL;
if (slp->ns_cc == slp->ns_reclen) {
recm = slp->ns_raw;
slp->ns_raw = slp->ns_rawend = (struct mbuf *)0;