diff options
Diffstat (limited to 'e2fsprogs/ext2fs/imager.c')
-rw-r--r-- | e2fsprogs/ext2fs/imager.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/e2fsprogs/ext2fs/imager.c b/e2fsprogs/ext2fs/imager.c index 596fbbebe..3f2826b82 100644 --- a/e2fsprogs/ext2fs/imager.c +++ b/e2fsprogs/ext2fs/imager.c | |||
@@ -66,9 +66,7 @@ errcode_t ext2fs_image_inode_write(ext2_filsys fs, int fd, int flags) | |||
66 | ssize_t actual; | 66 | ssize_t actual; |
67 | errcode_t retval; | 67 | errcode_t retval; |
68 | 68 | ||
69 | buf = malloc(fs->blocksize * BUF_BLOCKS); | 69 | buf = xmalloc(fs->blocksize * BUF_BLOCKS); |
70 | if (!buf) | ||
71 | return ENOMEM; | ||
72 | 70 | ||
73 | for (group = 0; group < fs->group_desc_count; group++) { | 71 | for (group = 0; group < fs->group_desc_count; group++) { |
74 | blk = fs->group_desc[(unsigned)group].bg_inode_table; | 72 | blk = fs->group_desc[(unsigned)group].bg_inode_table; |
@@ -138,9 +136,7 @@ errcode_t ext2fs_image_inode_read(ext2_filsys fs, int fd, | |||
138 | ssize_t actual; | 136 | ssize_t actual; |
139 | errcode_t retval; | 137 | errcode_t retval; |
140 | 138 | ||
141 | buf = malloc(fs->blocksize * BUF_BLOCKS); | 139 | buf = xmalloc(fs->blocksize * BUF_BLOCKS); |
142 | if (!buf) | ||
143 | return ENOMEM; | ||
144 | 140 | ||
145 | for (group = 0; group < fs->group_desc_count; group++) { | 141 | for (group = 0; group < fs->group_desc_count; group++) { |
146 | blk = fs->group_desc[(unsigned)group].bg_inode_table; | 142 | blk = fs->group_desc[(unsigned)group].bg_inode_table; |
@@ -187,9 +183,7 @@ errcode_t ext2fs_image_super_write(ext2_filsys fs, int fd, | |||
187 | ssize_t actual; | 183 | ssize_t actual; |
188 | errcode_t retval; | 184 | errcode_t retval; |
189 | 185 | ||
190 | buf = malloc(fs->blocksize); | 186 | buf = xmalloc(fs->blocksize); |
191 | if (!buf) | ||
192 | return ENOMEM; | ||
193 | 187 | ||
194 | /* | 188 | /* |
195 | * Write out the superblock | 189 | * Write out the superblock |
@@ -238,9 +232,7 @@ errcode_t ext2fs_image_super_read(ext2_filsys fs, int fd, | |||
238 | errcode_t retval; | 232 | errcode_t retval; |
239 | 233 | ||
240 | size = fs->blocksize * (fs->group_desc_count + 1); | 234 | size = fs->blocksize * (fs->group_desc_count + 1); |
241 | buf = malloc(size); | 235 | buf = xmalloc(size); |
242 | if (!buf) | ||
243 | return ENOMEM; | ||
244 | 236 | ||
245 | /* | 237 | /* |
246 | * Read it all in. | 238 | * Read it all in. |
@@ -364,9 +356,7 @@ errcode_t ext2fs_image_bitmap_read(ext2_filsys fs, int fd, int flags) | |||
364 | } | 356 | } |
365 | size = size * fs->group_desc_count; | 357 | size = size * fs->group_desc_count; |
366 | 358 | ||
367 | buf = malloc(size); | 359 | buf = xmalloc(size); |
368 | if (!buf) | ||
369 | return ENOMEM; | ||
370 | 360 | ||
371 | actual = read(fd, buf, size); | 361 | actual = read(fd, buf, size); |
372 | if (actual == -1) { | 362 | if (actual == -1) { |