Source-Changes-HG archive

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

[src/trunk]: src/sbin/fsck_ext2fs Fix previous properly (wrong variable was t...



details:   https://anonhg.NetBSD.org/src/rev/e4f70f1c2e4e
branches:  trunk
changeset: 823394:e4f70f1c2e4e
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Apr 21 19:33:56 2017 +0000

description:
Fix previous properly (wrong variable was tested) thanks riastradh@

diffstat:

 sbin/fsck_ext2fs/pass1.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r d87653550f16 -r e4f70f1c2e4e sbin/fsck_ext2fs/pass1.c
--- a/sbin/fsck_ext2fs/pass1.c  Fri Apr 21 19:18:05 2017 +0000
+++ b/sbin/fsck_ext2fs/pass1.c  Fri Apr 21 19:33:56 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pass1.c,v 1.25 2017/04/21 17:33:04 christos Exp $      */
+/*     $NetBSD: pass1.c,v 1.26 2017/04/21 19:33:56 christos Exp $      */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -58,7 +58,7 @@
 #if 0
 static char sccsid[] = "@(#)pass1.c    8.1 (Berkeley) 6/5/93";
 #else
-__RCSID("$NetBSD: pass1.c,v 1.25 2017/04/21 17:33:04 christos Exp $");
+__RCSID("$NetBSD: pass1.c,v 1.26 2017/04/21 19:33:56 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -239,7 +239,7 @@
                 * will detect any garbage after symlink string.
                 */
                if (inosize(dp) < EXT2_MAXSYMLINKLEN ||
-                   EXT2_MAXSYMLINKLEN == 0) {
+                   (EXT2_MAXSYMLINKLEN == 0 && inonblock(dp) == 0)) {
                        ndb = howmany(inosize(dp), sizeof(u_int32_t));
                        if (ndb > EXT2FS_NDADDR) {
                                j = ndb - EXT2FS_NDADDR;



Home | Main Index | Thread Index | Old Index