Fri Oct 7 21:09:57 2016 UTC ()
PR/514612: Mateusz Paszwa: When no more data, bail out (reading from empty
files) instead of stuck looping.


(christos)
diff -r1.64 -r1.65 src/usr.sbin/puffs/mount_psshfs/node.c

cvs diff -r1.64 -r1.65 src/usr.sbin/puffs/mount_psshfs/node.c (expand / switch to context diff)
--- src/usr.sbin/puffs/mount_psshfs/node.c 2012/01/20 22:07:58 1.64
+++ src/usr.sbin/puffs/mount_psshfs/node.c 2016/10/07 21:09:57 1.65
@@ -1,4 +1,4 @@
-/*	$NetBSD: node.c,v 1.64 2012/01/20 22:07:58 jakllsch Exp $	*/
+/*	$NetBSD: node.c,v 1.65 2016/10/07 21:09:57 christos Exp $	*/
 
 /*
  * Copyright (c) 2006-2009  Antti Kantee.  All Rights Reserved.
@@ -27,7 +27,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: node.c,v 1.64 2012/01/20 22:07:58 jakllsch Exp $");
+__RCSID("$NetBSD: node.c,v 1.65 2016/10/07 21:09:57 christos Exp $");
 #endif /* !lint */
 
 #include <assert.h>
@@ -563,7 +563,7 @@
 		TAILQ_REMOVE(&psn->pw, pwp, pw_entries);
 	}
 
-	if (rv == 0 && *resid > 0) {
+	if (rv == 0 && *resid > 0 && readlen > 0) {
 		reqid = NEXTREQ(pctx);
 		psbuf_recycleout(pb);
 		goto again;