Dmitry V. Levin
3e9d71feaa
Introduce wrappers to the following functions that do memory allocation: malloc, calloc, realloc, strdup. This commit is a follow-up to the related discussions in strace-devel ML: http://sourceforge.net/p/strace/mailman/message/33618180/ http://sourceforge.net/p/strace/mailman/message/33733470/ * defs.h (xmalloc, xcalloc, xreallocarray, xstrdup): New prototypes. * xmalloc.c: New file. * Makefile.am (strace_SOURCES): Add it. * count.c (count_syscall, call_summary_pers): Use xcalloc. * desc.c (decode_select): Use xmalloc. * dirent.c (sys_getdents, sys_getdents64): Likewise. * net.c (sys_recvmmsg): Use xstrdup. * pathtrace.c (storepath): Use xreallocarray. (pathtrace_match): Use xmalloc. * strace.c (die_out_of_memory): Move to xmalloc.c. (expand_tcbtab): Use xcalloc and xreallocarray. (startup_child): Use xstrdup. (init): Use xmalloc, xcalloc, and xstrdup. * syscall.c (reallocate_qual): Use xreallocarray. (qualify): Use xstrdup. * unwind.c (unwind_tcb_init): Use xmalloc. (build_mmap_cache): Use xcalloc, xreallocarray, and xstrdup. (get_symbol_name): Use xreallocarray. (stacktrace_walk, queue_put): Use xmalloc. * util.c (printstr): Use xmalloc. * vsprintf.c (strace_vfprintf): Likewise.
61 lines
822 B
C
61 lines
822 B
C
#include "defs.h"
|
|
|
|
void die_out_of_memory(void)
|
|
{
|
|
static bool recursed = false;
|
|
|
|
if (recursed)
|
|
exit(1);
|
|
recursed = 1;
|
|
|
|
error_msg_and_die("Out of memory");
|
|
}
|
|
|
|
void *xmalloc(size_t size)
|
|
{
|
|
void *p = malloc(size);
|
|
|
|
if (!p)
|
|
die_out_of_memory();
|
|
|
|
return p;
|
|
}
|
|
|
|
void *xcalloc(size_t nmemb, size_t size)
|
|
{
|
|
void *p = calloc(nmemb, size);
|
|
|
|
if (!p)
|
|
die_out_of_memory();
|
|
|
|
return p;
|
|
}
|
|
|
|
#define HALF_SIZE_T (((size_t) 1) << (sizeof(size_t) * 4))
|
|
|
|
void *xreallocarray(void *ptr, size_t nmemb, size_t size)
|
|
{
|
|
size_t bytes = nmemb * size;
|
|
|
|
if ((nmemb | size) >= HALF_SIZE_T &&
|
|
size && bytes / size != nmemb)
|
|
die_out_of_memory();
|
|
|
|
void *p = realloc(ptr, bytes);
|
|
|
|
if (!p)
|
|
die_out_of_memory();
|
|
|
|
return p;
|
|
}
|
|
|
|
char *xstrdup(const char *str)
|
|
{
|
|
char *p = strdup(str);
|
|
|
|
if (!p)
|
|
die_out_of_memory();
|
|
|
|
return p;
|
|
}
|