aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c4
-rw-r--r--e2fsprogs/old_e2fsprogs/fsck.c8
2 files changed, 3 insertions, 9 deletions
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c
index da1cf5be5..b9aab440a 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c
@@ -50,9 +50,7 @@ errcode_t ext2fs_resize_mem(unsigned long EXT2FS_ATTR((unused)) old_size,
50 /* Use "memcpy" for pointer assignments here to avoid problems 50 /* Use "memcpy" for pointer assignments here to avoid problems
51 * with C99 strict type aliasing rules. */ 51 * with C99 strict type aliasing rules. */
52 memcpy(&p, ptr, sizeof (p)); 52 memcpy(&p, ptr, sizeof (p));
53 p = realloc(p, size); 53 p = xrealloc(p, size);
54 if (!p)
55 return EXT2_ET_NO_MEMORY;
56 memcpy(ptr, &p, sizeof (p)); 54 memcpy(ptr, &p, sizeof (p));
57 return 0; 55 return 0;
58} 56}
diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c
index 687938c24..c0964f79d 100644
--- a/e2fsprogs/old_e2fsprogs/fsck.c
+++ b/e2fsprogs/old_e2fsprogs/fsck.c
@@ -377,8 +377,7 @@ static struct fs_info *create_fs_device(const char *device, const char *mntpnt,
377{ 377{
378 struct fs_info *fs; 378 struct fs_info *fs;
379 379
380 if (!(fs = malloc(sizeof(struct fs_info)))) 380 fs = xmalloc(sizeof(struct fs_info));
381 return NULL;
382 381
383 fs->device = string_copy(device); 382 fs->device = string_copy(device);
384 fs->mountpt = string_copy(mntpnt); 383 fs->mountpt = string_copy(mntpnt);
@@ -573,10 +572,7 @@ static int execute(const char *type, const char *device, const char *mntpt,
573 struct fsck_instance *inst, *p; 572 struct fsck_instance *inst, *p;
574 pid_t pid; 573 pid_t pid;
575 574
576 inst = malloc(sizeof(struct fsck_instance)); 575 inst = xzalloc(sizeof(struct fsck_instance));
577 if (!inst)
578 return ENOMEM;
579 memset(inst, 0, sizeof(struct fsck_instance));
580 576
581 prog = xasprintf("fsck.%s", type); 577 prog = xasprintf("fsck.%s", type);
582 argv[0] = prog; 578 argv[0] = prog;