glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

util.c: make "Out of memory" messages a bit more informative

Browse Source 
Since these are emitted in multiple places and are not expected during
any normal operation, it makes sense to report the caller name.

* util.c (print_quoted_string_ex, print_quoted_string_ex, dumpiov_upto,
dumpstr): Replace error_msg with error_func_msg.
This commit is contained in:
Eugene Syromyatnikov 2018-04-09 10:19:01 +02:00 committed by Dmitry V. Levin
parent 300a5a39f1
commit fbb12e77d5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util.c
View File

@ -693,7 +693,7 @@ print_quoted_string_ex(const char *str, unsigned int size,
alloc_size = 4 * size;
if (alloc_size / 4 != size) {
error_msg("Out of memory");
error_func_msg("Out of memory");
tprints("???");
return -1;
}
@ -706,7 +706,7 @@ print_quoted_string_ex(const char *str, unsigned int size,
} else {
outstr = buf = malloc(alloc_size);
if (!buf) {
error_msg("Out of memory");
error_func_msg("Out of memory");
tprints("???");
return -1;
}
@ -888,7 +888,7 @@ dumpiov_upto(struct tcb *const tcp, const int len, const kernel_ulong_t addr,
/* Assuming no sane program has millions of iovs */
if ((unsigned)len > 1024*1024 /* insane or negative size? */
|| (iov = malloc(size)) == NULL) {
error_msg("Out of memory");
error_func_msg("Out of memory");
return;
}
if (umoven(tcp, addr, size, iov) >= 0) {
@ -935,7 +935,7 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
str = malloc(len + 16);
if (!str) {
strsize = -1;
error_msg("Out of memory");
error_func_msg("Out of memory");
return;
}
strsize = len + 16;