Mercurial > dovecot > original-hg > dovecot-1.2
changeset 8639:685a5e3565b0 HEAD
mempool system clean: Don't break if realloc() shrinks the memory area.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Thu, 15 Jan 2009 21:36:26 -0500 |
| parents | b8357fbedc8f |
| children | 1bfe762cb9ff |
| files | src/lib/mempool-system-clean.c |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib/mempool-system-clean.c Thu Jan 15 17:21:18 2009 -0500 +++ b/src/lib/mempool-system-clean.c Thu Jan 15 21:36:26 2009 -0500 @@ -136,6 +136,7 @@ size_t old_size, size_t new_size) { void *new_mem; + size_t old_alloc_size; if (unlikely(new_size == 0 || new_size > SSIZE_T_MAX)) i_panic("Trying to allocate %"PRIuSIZE_T" bytes", new_size); @@ -146,14 +147,15 @@ i_assert(old_size == (size_t)-1 || old_size <= malloc_usable_size(mem)); #endif - memcpy(new_mem, mem, mem_get_size(mem)); - pool_system_clean_free(pool, mem); + old_alloc_size = mem_get_size(mem); + memcpy(new_mem, mem, I_MIN(old_alloc_size, new_size)); if (old_size < new_size) { /* clear new data */ memset((char *)new_mem + old_size, 0, new_size - old_size); } + pool_system_clean_free(pool, mem); } return new_mem;