kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-04 20:17:41 +00:00
Code Issues Projects Releases Wiki Activity

FS-10043: [libks] ks_pool_resize error #resolve

Browse Source
This commit is contained in:
Anthony Minessale 2017-02-14 20:48:54 -06:00
parent e8bd2d6f98
commit b79469b413
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/libks/src/ks_pool.c
View File

@ -1695,6 +1695,7 @@ KS_DECLARE(void *) ks_pool_resize_ex(ks_pool_t *mp_p, void *old_addr, const unsi
ks_pool_block_t *block_p; ks_pool_block_t *block_p;
int ret; int ret;
alloc_prefix_t *prefix; alloc_prefix_t *prefix;
void *orig_old_addr = NULL;
ks_assert(mp_p); ks_assert(mp_p);
//ks_assert(old_addr); //ks_assert(old_addr);
@ -1754,6 +1755,7 @@ KS_DECLARE(void *) ks_pool_resize_ex(ks_pool_t *mp_p, void *old_addr, const unsi
} }
} }
orig_old_addr = old_addr;
/* move pointer to actual beginning */ /* move pointer to actual beginning */
old_addr = prefix; old_addr = prefix;
@ -1779,12 +1781,12 @@ KS_DECLARE(void *) ks_pool_resize_ex(ks_pool_t *mp_p, void *old_addr, const unsi
goto end; goto end;
} }
if (new_byte_size > old_byte_size) { copy_size = old_byte_size;
copy_size = old_byte_size; memcpy(new_addr, orig_old_addr, copy_size);
} else {
copy_size = new_byte_size; if (!(mp_p->mp_flags & KS_POOL_FLAG_NO_ZERO)) {
memset(((unsigned char *)new_addr) + copy_size, 0, new_byte_size - old_byte_size);
} }
memcpy(new_addr, old_addr, copy_size);
/* free the old address */ /* free the old address */
ret = free_mem(mp_p, (uint8_t *)old_addr + PREFIX_SIZE); ret = free_mem(mp_p, (uint8_t *)old_addr + PREFIX_SIZE);

8
libs/libks/test/testpools.c
View File

@ -166,10 +166,16 @@ int main(int argc, char **argv)
printf("RESIZE:\n"); printf("RESIZE:\n");
ks_snprintf(str, bytes, "%s", "ABCDEFGHIJKLM");
printf("1 STR [%s]\n", str);
bytes *= 2; bytes *= 2;
str = ks_pool_resize(pool, str, bytes); str = ks_pool_resize(pool, str, bytes);
printf("2 STR [%s]\n", str);
ok(!strcmp(str, "ABCDEFGHIJKLM"));
ok(str != NULL);
if (!str) { if (!str) {
fprintf(stderr, "RESIZE ERR: [FAILED]\n"); fprintf(stderr, "RESIZE ERR: [FAILED]\n");
exit(255); exit(255);