pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix %u format that should have been %zu. 

Change-Id: Icedacf6783d6b0cf4783c838b3c4622d2e67f073
This commit is contained in:
Christopher Ferris 2014-06-12 18:20:44 -07:00
parent a403780538
commit 580b6e09fe
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libc/bionic/malloc_debug_qemu.cpp
View File

@ -693,7 +693,7 @@ extern "C" void* qemu_instrumented_malloc(size_t bytes) {
} }
desc.ptr = Malloc(malloc)(size); desc.ptr = Malloc(malloc)(size);
if (desc.ptr == NULL) { if (desc.ptr == NULL) {
qemu_error_log("<libc_pid=%03u, pid=%03u> malloc(%zu): malloc(%u) failed.", qemu_error_log("<libc_pid=%03u, pid=%03u> malloc(%zu): malloc(%zu) failed.",
malloc_pid, getpid(), bytes, size); malloc_pid, getpid(), bytes, size);
return NULL; return NULL;
} }
@ -898,14 +898,14 @@ extern "C" void* qemu_instrumented_realloc(void* mem, size_t bytes) {
new_desc.suffix_size = DEFAULT_SUFFIX_SIZE; new_desc.suffix_size = DEFAULT_SUFFIX_SIZE;
size_t new_size = mallocdesc_alloc_size(&new_desc); size_t new_size = mallocdesc_alloc_size(&new_desc);
if (new_size < bytes) { // Overflow if (new_size < bytes) { // Overflow
qemu_error_log("<libc_pid=%03u, pid=%03u>: realloc(%p, %zu): malloc(%u) failed due to overflow", qemu_error_log("<libc_pid=%03u, pid=%03u>: realloc(%p, %zu): malloc(%zu) failed due to overflow",
malloc_pid, getpid(), mem, bytes, new_size); malloc_pid, getpid(), mem, bytes, new_size);
errno = ENOMEM; errno = ENOMEM;
return NULL; return NULL;
} }
new_desc.ptr = Malloc(malloc)(new_size); new_desc.ptr = Malloc(malloc)(new_size);
if (new_desc.ptr == NULL) { if (new_desc.ptr == NULL) {
log_mdesc(error, &cur_desc, "<libc_pid=%03u, pid=%03u>: realloc(%p, %zu): malloc(%u) failed on ", log_mdesc(error, &cur_desc, "<libc_pid=%03u, pid=%03u>: realloc(%p, %zu): malloc(%zu) failed on ",
malloc_pid, getpid(), mem, bytes, new_size); malloc_pid, getpid(), mem, bytes, new_size);
return NULL; return NULL;
} }
@ -978,14 +978,14 @@ extern "C" void* qemu_instrumented_memalign(size_t alignment, size_t bytes) {
desc.suffix_size = DEFAULT_SUFFIX_SIZE; desc.suffix_size = DEFAULT_SUFFIX_SIZE;
size_t size = mallocdesc_alloc_size(&desc); size_t size = mallocdesc_alloc_size(&desc);
if (size < bytes) { // Overflow if (size < bytes) { // Overflow
qemu_error_log("<libc_pid=%03u, pid=%03u> memalign(%zx, %zu): malloc(%u) failed due to overflow.", qemu_error_log("<libc_pid=%03u, pid=%03u> memalign(%zx, %zu): malloc(%zu) failed due to overflow.",
malloc_pid, getpid(), alignment, bytes, size); malloc_pid, getpid(), alignment, bytes, size);
return NULL; return NULL;
} }
desc.ptr = Malloc(memalign)(desc.prefix_size, size); desc.ptr = Malloc(memalign)(desc.prefix_size, size);
if (desc.ptr == NULL) { if (desc.ptr == NULL) {
error_log("<libc_pid=%03u, pid=%03u> memalign(%zx, %zu): malloc(%u) failed.", error_log("<libc_pid=%03u, pid=%03u> memalign(%zx, %zu): malloc(%zu) failed.",
malloc_pid, getpid(), alignment, bytes, size); malloc_pid, getpid(), alignment, bytes, size);
return NULL; return NULL;
} }