Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/puffs/mount_psshfs PR/514612: Mateusz Paszwa: When ...



details:   https://anonhg.NetBSD.org/src/rev/05255ae7d07f
branches:  trunk
changeset: 818319:05255ae7d07f
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 07 21:09:57 2016 +0000

description:
PR/514612: Mateusz Paszwa: When no more data, bail out (reading from empty
files) instead of stuck looping.

diffstat:

 usr.sbin/puffs/mount_psshfs/node.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r c0a9af992764 -r 05255ae7d07f usr.sbin/puffs/mount_psshfs/node.c
--- a/usr.sbin/puffs/mount_psshfs/node.c        Fri Oct 07 19:47:16 2016 +0000
+++ b/usr.sbin/puffs/mount_psshfs/node.c        Fri Oct 07 21:09:57 2016 +0000
@@ -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;



Home | Main Index | Thread Index | Old Index