From: Mike F. <va...@ge...> - 2009-10-08 00:42:12
|
When getdents finishes processing, it returns 0. Strace uses this to then try and do malloc(0), but on some systems this will always return NULL. Since the code won't read the pointer in question if len is 0, then don't bother calling malloc() and set the pointer to NULL our self. * file.c (sys_getdents, sys_getdents64): Ignore malloc(0) == NULL. Signed-off-by: Mike Frysinger <va...@ge...> --- v2 - revised code based on feedback from Dmitry file.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/file.c b/file.c index c6e3b52..4a2512f 100644 --- a/file.c +++ b/file.c @@ -2337,7 +2337,8 @@ sys_getdents(struct tcb *tcp) return 0; } len = tcp->u_rval; - if ((buf = malloc(len)) == NULL) { + buf = len ? malloc(len) : NULL; + if (len && !buf) { tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]); fprintf(stderr, "out of memory\n"); return 0; @@ -2420,7 +2421,8 @@ sys_getdents64(struct tcb *tcp) return 0; } len = tcp->u_rval; - if ((buf = malloc(len)) == NULL) { + buf = len ? malloc(len) : NULL; + if (len && !buf) { tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]); fprintf(stderr, "out of memory\n"); return 0; -- 1.6.5.rc2 |