mkfs.cramfs: use xalloc.h

Before this commit two strdup calls, in line 366 and 374, where
able to fail silently and cause a rare bug.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index 0bfd1370c4f182a804bf77621961d631bc12c2a9..167535fc34d7bef6beb9a880f82c6f30b34b0de0 100644 (file)
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -41,6 +41,8 @@
 #include "md5.h"
 #include "nls.h"
 #include "mkfs.h"
+#define XALLOC_EXIT_CODE MKFS_ERROR
+#include "xalloc.h"
 
 /* The kernel only supports PAD_SIZE of 0 and 512. */
 #define PAD_SIZE 512
@@ -140,17 +142,6 @@ usage(int status) {
        exit(status);
 }
 
-/* malloc or die */
-static void *
-xmalloc (size_t size) {
-       void *t = malloc(size);
-       if (t == NULL) {
-               perror(NULL);
-               exit(MKFS_ERROR);       /* out of memory */
-       }
-       return t;
-}
-
 static char *
 do_mmap(char *path, unsigned int size, unsigned int mode){
        int fd;
@@ -344,16 +335,8 @@ static unsigned int parse_directory(struct entry *root_entry, const char *name,
                        warn_skip = 1;
                        continue;
                }
-               entry = calloc(1, sizeof(struct entry));
-               if (!entry) {
-                       perror(NULL);
-                       exit(MKFS_ERROR);
-               }
-               entry->name = (unsigned char *)strdup(dirent->d_name);
-               if (!entry->name) {
-                       perror(NULL);
-                       exit(MKFS_ERROR);
-               }
+               entry = xcalloc(1, sizeof(struct entry));
+               entry->name = (unsigned char *)xstrdup(dirent->d_name);
                if (namelen > 255) {
                        /* Can't happen when reading from ext2fs. */
 
@@ -380,7 +363,7 @@ static unsigned int parse_directory(struct entry *root_entry, const char *name,
                if (S_ISDIR(st.st_mode)) {
                        entry->size = parse_directory(root_entry, path, &entry->child, fslen_ub);
                } else if (S_ISREG(st.st_mode)) {
-                       entry->path = strdup(path);
+                       entry->path = xstrdup(path);
                        if (entry->size) {
                                if (entry->size >= (1 << CRAMFS_SIZE_WIDTH)) {
                                        warn_size = 1;
@@ -388,7 +371,7 @@ static unsigned int parse_directory(struct entry *root_entry, const char *name,
                                }
                        }
                } else if (S_ISLNK(st.st_mode)) {
-                       entry->path = strdup(path);
+                       entry->path = xstrdup(path);
                } else if (S_ISFIFO(st.st_mode) || S_ISSOCK(st.st_mode)) {
                        /* maybe we should skip sockets */
                        entry->size = 0;
@@ -517,11 +500,7 @@ static unsigned int write_directory_structure(struct entry *entry, char *base, u
                        if (entry->child) {
                                if (stack_entries >= stack_size) {
                                        stack_size *= 2;
-                                       entry_stack = realloc(entry_stack, stack_size * sizeof(struct entry *));
-                                       if (!entry_stack) {
-                                               perror(NULL);
-                                               exit(MKFS_ERROR);        /* out of memory */
-                                       }
+                                       entry_stack = xrealloc(entry_stack, stack_size * sizeof(struct entry *));
                                }
                                entry_stack[stack_entries] = entry;
                                stack_entries++;
@@ -827,11 +806,7 @@ int main(int argc, char **argv)
        }
        fd = open(outfile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
 
-       root_entry = calloc(1, sizeof(struct entry));
-       if (!root_entry) {
-               perror(NULL);
-               exit(MKFS_ERROR);
-       }
+       root_entry = xcalloc(1, sizeof(struct entry));
        root_entry->mode = st.st_mode;
        root_entry->uid = st.st_uid;
        root_entry->gid = st.st_gid;