summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorJohn Beppu2000-02-11 12:52:55 +0000
committerJohn Beppu2000-02-11 12:52:55 +0000
commit5e1b2ca1161cba481ccf4873427389f59dbc23e0 (patch)
treebe383c16e82d92c627a2080a5e711830cfc4d046 /util-linux
parentfa376f80348b4241124c8e4c727bcb57181e50d1 (diff)
downloadbusybox-5e1b2ca1161cba481ccf4873427389f59dbc23e0.zip
busybox-5e1b2ca1161cba481ccf4873427389f59dbc23e0.tar.gz
+ memory allocation/deallocation is less tolerant of evil.
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/fsck_minix.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 9da7974..cfa973e 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -146,7 +146,7 @@ static int termios_set = 0;
#define MAX_DEPTH 32
static int name_depth = 0;
// static char name_list[MAX_DEPTH][PATH_MAX + 1];
-static char **name_list;
+static char **name_list = NULL;
static char *inode_buffer = NULL;
@@ -1248,14 +1248,33 @@ static void alloc_name_list(void)
int i;
name_list = malloc(sizeof(char *) * MAX_DEPTH);
+ if (!name_list) {
+ fprintf(stderr,"fsck_minix: name_list: %s\n", strerror(errno));
+ exit(1);
+ }
for (i = 0; i < MAX_DEPTH; i++) {
name_list[i] = malloc(sizeof(char) * PATH_MAX + 1);
+ if (!name_list[i]) {
+ fprintf(stderr,"fsck_minix: name_list: %s\n", strerror(errno));
+ exit(1);
+ }
}
}
+/* execute this atexit() to deallocate name_list[] */
+/* piptigger was here */
static void free_name_list(void)
{
- if (name_list) free(name_list);
+ int i;
+
+ if (name_list) {
+ for (i = 0; i < MAX_DEPTH; i++) {
+ if (name_list[i]) {
+ free(name_list[i]);
+ }
+ }
+ free(name_list);
+ }
}
extern int fsck_minix_main(int argc, char **argv)