summaryrefslogtreecommitdiff
path: root/mkfs.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2015-11-06 17:57:41 +0100
committerDavid Sterba <dsterba@suse.com>2015-11-13 18:24:34 +0100
commit6046bfd5e34054f61c682ec7e425e907a8f1e051 (patch)
tree9ac085d4ba6b614dbd72d159c9419e57635fae6d /mkfs.c
parent59a90681616ba97437b8053b1917fa72f0162e4c (diff)
btrfs-progs: handle memory allocation failure in add_file_items
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'mkfs.c')
-rw-r--r--mkfs.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/mkfs.c b/mkfs.c
index 0ea39f38..7316cb1c 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -648,6 +648,12 @@ static int add_file_items(struct btrfs_trans_handle *trans,
if (st->st_size <= BTRFS_MAX_INLINE_DATA_SIZE(root)) {
char *buffer = malloc(st->st_size);
+
+ if (!buffer) {
+ ret = -ENOMEM;
+ goto end;
+ }
+
ret_read = pread64(fd, buffer, st->st_size, bytes_read);
if (ret_read == -1) {
fprintf(stderr, "%s read failed\n", path_name);