Author: coreyfarrell Date: Thu Nov 6 03:10:47 2014 New Revision: 427381 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427381 Log: Fix unintential memory retention in stringfields.
* Fix missing / unreachable calls to __ast_string_field_release_active. * Reset pool->used to zero when the current pool->active reaches zero. ASTERISK-24307 #close Reported by: Etienne Lessard Tested by: ibercom, Etienne Lessard Review: https://reviewboard.asterisk.org/r/4114/ ........ Merged revisions 427380 from http://svn.asterisk.org/svn/asterisk/branches/1.8 Modified: branches/11/ (props changed) branches/11/include/asterisk/stringfields.h branches/11/main/utils.c Propchange: branches/11/ ------------------------------------------------------------------------------ Binary property 'branch-1.8-merged' - no diff available. Modified: branches/11/include/asterisk/stringfields.h URL: http://svnview.digium.com/svn/asterisk/branches/11/include/asterisk/stringfields.h?view=diff&rev=427381&r1=427380&r2=427381 ============================================================================== --- branches/11/include/asterisk/stringfields.h (original) +++ branches/11/include/asterisk/stringfields.h Thu Nov 6 03:10:47 2014 @@ -315,21 +315,23 @@ */ #define ast_string_field_ptr_set(x, ptr, data) ast_string_field_ptr_set_by_fields((x)->__field_mgr_pool, (x)->__field_mgr, ptr, data) -#define ast_string_field_ptr_set_by_fields(field_mgr_pool, field_mgr, ptr, data) do { \ - const char *__d__ = (data); \ - size_t __dlen__ = (__d__) ? strlen(__d__) + 1 : 1; \ - ast_string_field *__p__ = (ast_string_field *) (ptr); \ - if (__dlen__ == 1) { \ - __ast_string_field_release_active(field_mgr_pool, *__p__); \ - *__p__ = __ast_string_field_empty; \ - } else if ((__dlen__ <= AST_STRING_FIELD_ALLOCATION(*__p__)) || \ - (!__ast_string_field_ptr_grow(&field_mgr, &field_mgr_pool, __dlen__, __p__)) || \ - (*__p__ = __ast_string_field_alloc_space(&field_mgr, &field_mgr_pool, __dlen__))) { \ - if (*__p__ != (*ptr)) { \ - __ast_string_field_release_active(field_mgr_pool, (*ptr)); \ - } \ - memcpy(* (void **) __p__, __d__, __dlen__); \ - } \ +#define ast_string_field_ptr_set_by_fields(field_mgr_pool, field_mgr, ptr, data) do { \ + const char *__d__ = (data); \ + size_t __dlen__ = (__d__) ? strlen(__d__) + 1 : 1; \ + ast_string_field *__p__ = (ast_string_field *) (ptr); \ + ast_string_field target = *__p__; \ + if (__dlen__ == 1) { \ + __ast_string_field_release_active(field_mgr_pool, *__p__); \ + *__p__ = __ast_string_field_empty; \ + } else if ((__dlen__ <= AST_STRING_FIELD_ALLOCATION(*__p__)) || \ + (!__ast_string_field_ptr_grow(&field_mgr, &field_mgr_pool, __dlen__, __p__)) || \ + (target = __ast_string_field_alloc_space(&field_mgr, &field_mgr_pool, __dlen__))) { \ + if (target != (*__p__)) { \ + __ast_string_field_release_active(field_mgr_pool, *__p__); \ + *__p__ = target; \ + } \ + memcpy(* (void **) __p__, __d__, __dlen__); \ + } \ } while (0) /*! Modified: branches/11/main/utils.c URL: http://svnview.digium.com/svn/asterisk/branches/11/main/utils.c?view=diff&rev=427381&r1=427380&r2=427381 ============================================================================== --- branches/11/main/utils.c (original) +++ branches/11/main/utils.c Thu Nov 6 03:10:47 2014 @@ -1998,9 +1998,13 @@ for (pool = pool_head, prev = NULL; pool; prev = pool, pool = pool->prev) { if ((ptr >= pool->base) && (ptr <= (pool->base + pool->size))) { pool->active -= AST_STRING_FIELD_ALLOCATION(ptr); - if ((pool->active == 0) && prev) { - prev->prev = pool->prev; - ast_free(pool); + if (pool->active == 0) { + if (prev) { + prev->prev = pool->prev; + ast_free(pool); + } else { + pool->used = 0; + } } break; } @@ -2047,6 +2051,11 @@ if (res < 0) { /* Are we out of memory? */ + return; + } + if (res == 0) { + __ast_string_field_release_active(*pool_head, *ptr); + *ptr = __ast_string_field_empty; return; } needed = (size_t)res + 1; /* NUL byte */ -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
