do not walk off the end of a directory info buffer; netbsd pr#3170, mhitch@gemini...

diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index d18d4fc..81ed30e 100644 (file)
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: nfs_serv.c,v 1.9 1997/01/28 18:50:21 niklas Exp $     */
+/*     $OpenBSD: nfs_serv.c,v 1.10 1997/01/31 10:30:48 deraadt Exp $   */
 /*     $NetBSD: nfs_serv.c,v 1.25 1996/03/02 15:55:52 jtk Exp $        */
 
 /*
@@ -2803,8 +2803,8 @@ again:
        dp = (struct dirent *)cpos;
        cookiep = cookies;
 
-       while ((dp->d_fileno == 0 || dp->d_type == DT_WHT)
-              && cpos < cend && ncookies > 0) {
+       while (cpos < cend && ncookies > 0
+              && (dp->d_fileno == 0 || dp->d_type == DT_WHT)) {
                cpos += dp->d_reclen;
                dp = (struct dirent *)cpos;
                cookiep++;