2013-01-07 21:45:55

by Eric Sandeen

Subject: [PATCH] e2fsck: show size requested when memory allocation fails

"e2fsck: Can't allocate dx_block info array"
is only so helpful - it'd be nice to know how much it tried to allocate.

In particular, since I think malloc(0) can return NULL,
it'd be nice to know if maybe we passed in an uninitialized (or
0-initialized) size.

Signed-off-by: Eric Sandeen <[email protected]>
---

diff --git a/e2fsck/util.c b/e2fsck/util.c
index a808eec..6242954 100644
--- a/e2fsck/util.c
+++ b/e2fsck/util.c
@@ -121,7 +121,8 @@ void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned int size,
#endif
ret = malloc(size);
if (!ret) {
- sprintf(buf, "Can't allocate %s\n", description);
+ sprintf(buf, "Can't allocate %u bytes for %s\n",
+ size, description);
fatal_error(ctx, buf);
}
memset(ret, 0, size);

2013-01-08 15:41:45

by Theodore Ts'o

Subject: Re: [PATCH] e2fsck: show size requested when memory allocation fails

On Mon, Jan 07, 2013 at 03:45:54PM -0600, Eric Sandeen wrote:
> "e2fsck: Can't allocate dx_block info array"
> is only so helpful - it'd be nice to know how much it tried to allocate.
>
> In particular, since I think malloc(0) can return NULL,
> it'd be nice to know if maybe we passed in an uninitialized (or
> 0-initialized) size.
>
> Signed-off-by: Eric Sandeen <[email protected]>

Thanks, applied.

- Ted