Sun Oct 12 23:26:12 2008 UTC ()

reallocate the correct amount. From Anon Ymous


(christos)

diff -r1.45 -r1.46 src/sbin/fsck_ffs/pass1.c

--- src/sbin/fsck_ffs/pass1.c 2008/10/09 15:50:46	1.45
+++ src/sbin/fsck_ffs/pass1.c 2008/10/12 23:26:12	1.46

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pass1.c,v 1.45 2008/10/09 15:50:46 christos Exp $	*/
+/*	$NetBSD: pass1.c,v 1.46 2008/10/12 23:26:12 christos Exp $	*/
 /*
  * Copyright (c) 1980, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)pass1.c	8.6 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: pass1.c,v 1.45 2008/10/09 15:50:46 christos Exp $");
+__RCSID("$NetBSD: pass1.c,v 1.46 2008/10/12 23:26:12 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ufs/ufs_bswap.h>
 #include <ufs/ffs/ffs_extern.h>
 @@ -193,27 +193,27 @@ pass1(void)
 		if (ninosused == 0) {
 			free(inostathead[c].il_stat);
 			inostathead[c].il_stat = 0;
 			continue;
+		}
 		if (ninosused != inosused) {
 			struct inostat *ninfo;
 			size_t ninospace = ninosused * sizeof(*ninfo);
 			if (ninospace / sizeof(*info) != ninosused) {
 				pfatal("too many inodes %llu\n",
 				    (unsigned long long)ninosused);
 				exit(FSCK_EXIT_CHECK_FAILED);
+			}
-			ninfo = realloc(info, ninosused);
+			ninfo = realloc(info, ninospace);
 			if (ninfo == NULL) {
 				pfatal("cannot realloc %zu bytes to %zu "
 				    "for inoinfo\n", inospace, ninospace);
 				exit(FSCK_EXIT_CHECK_FAILED);
+			}
 			if (ninosused > inosused)
 				(void)memset(&ninfo[inosused], 0, ninospace - inospace);
 			inostathead[c].il_stat = ninfo;
+		}
+	}
 #ifdef PROGRESS
 	if (!preen)
 		progress_done();