Module Name: src
Committed By: nia
Date: Wed Nov 3 14:25:39 UTC 2021
Modified Files:
src/sbin/disklabel: interact.c main.c
Log Message:
disklabel(8): convert malloc(x * y) to reallocarr
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sbin/disklabel/interact.c
cvs rdiff -u -r1.56 -r1.57 src/sbin/disklabel/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/disklabel/interact.c
diff -u src/sbin/disklabel/interact.c:1.39 src/sbin/disklabel/interact.c:1.40
--- src/sbin/disklabel/interact.c:1.39 Sun Jan 31 18:57:29 2016
+++ src/sbin/disklabel/interact.c Wed Nov 3 14:25:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: interact.c,v 1.39 2016/01/31 18:57:29 christos Exp $ */
+/* $NetBSD: interact.c,v 1.40 2021/11/03 14:25:39 nia Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: interact.c,v 1.39 2016/01/31 18:57:29 christos Exp $");
+__RCSID("$NetBSD: interact.c,v 1.40 2021/11/03 14:25:39 nia Exp $");
#endif /* lint */
#include <sys/param.h>
@@ -674,10 +674,10 @@ dumpnames(const char *prompt, const char
size_t i, entry, lines;
int columns, width;
const char *p;
- const char **list;
+ const char **list = NULL;
- if ((list = (const char **)malloc(sizeof(char *) * numentries)) == NULL)
- err(1, "malloc");
+ if (reallocarr(&list, numentries, sizeof(char *)) != 0)
+ err(1, "reallocarr");
width = 0;
printf("%s:\n", prompt);
for (i = 0; i < numentries; i++) {
Index: src/sbin/disklabel/main.c
diff -u src/sbin/disklabel/main.c:1.56 src/sbin/disklabel/main.c:1.57
--- src/sbin/disklabel/main.c:1.56 Sat May 29 17:41:51 2021
+++ src/sbin/disklabel/main.c Wed Nov 3 14:25:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.56 2021/05/29 17:41:51 christos Exp $ */
+/* $NetBSD: main.c,v 1.57 2021/11/03 14:25:39 nia Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
static char sccsid[] = "@(#)disklabel.c 8.4 (Berkeley) 5/4/95";
/* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */
#else
-__RCSID("$NetBSD: main.c,v 1.56 2021/05/29 17:41:51 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.57 2021/11/03 14:25:39 nia Exp $");
#endif
#endif /* not lint */
@@ -2207,11 +2207,10 @@ list_fs_types(void)
ret = 1;
if (nelems > 0) {
- const char **list;
+ const char **list = NULL;
size_t i;
- list = (const char **)malloc(sizeof(char *) * nelems);
- if (list == NULL) {
+ if (reallocarr(&list, nelems, sizeof(char *)) != 0) {
warnx("sorry, could not allocate memory for list");
ret = 0;
} else {
