kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Core] Fix size overflow in pool_stats (when configured with --enable-pool-debug)

This commit is contained in:
Andrey Volk 2020-06-09 15:27:00 +04:00
parent ddcfedba9b
commit 27c491dd0c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/switch_core_memory.c
View File

@ -356,7 +356,7 @@ SWITCH_DECLARE(void) switch_pool_clear(switch_memory_pool_t *p)
#if APR_POOL_DEBUG #if APR_POOL_DEBUG
static int switch_core_pool_stats_callback(apr_pool_t *pool, void *data) { static int switch_core_pool_stats_callback(apr_pool_t *pool, void *data) {
switch_stream_handle_t *stream = (switch_stream_handle_t *)data; switch_stream_handle_t *stream = (switch_stream_handle_t *)data;
unsigned int size = (unsigned int)apr_pool_num_bytes(pool, 1); size_t size = (size_t)apr_pool_num_bytes(pool, 1);
unsigned int alloc = 0, total_alloc = 0, clear = 0; unsigned int alloc = 0, total_alloc = 0, clear = 0;
char *line = NULL; char *line = NULL;
@ -364,9 +364,9 @@ static int switch_core_pool_stats_callback(apr_pool_t *pool, void *data) {
apr_pool_get_stats(pool, &alloc, &total_alloc, &clear); apr_pool_get_stats(pool, &alloc, &total_alloc, &clear);
if (stream) { if (stream) {
stream->write_function(stream, "Pool '%s' size: %d, alloc:%d, total_alloc:%d, clear:%d\n", (line ? line : apr_pool_tag(pool, NULL)), (int)size, alloc, total_alloc, clear); stream->write_function(stream, "Pool '%s' size: %" SWITCH_SIZE_T_FMT ", alloc:%d, total_alloc:%d, clear:%d\n", (line ? line : apr_pool_tag(pool, NULL)), size, alloc, total_alloc, clear);
} else { } else {
printf("Pool '%s' size: %d, alloc:%d, total_alloc:%d, clear:%d\n", (line ? line : apr_pool_tag(pool, NULL)), (int)size, alloc, total_alloc, clear); printf("Pool '%s' size: %" SWITCH_SIZE_T_FMT ", alloc:%d, total_alloc:%d, clear:%d\n", (line ? line : apr_pool_tag(pool, NULL)), size, alloc, total_alloc, clear);
} }
return 0; return 0;
} }