kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 20:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that accidental calls to ast_string_field_free_memory() on embedded stringfield pools are safe.

Browse Source 
It is possible for a stringfield manager structure (and pool) structure to be allocated
as part of a larger structure allocation (using ast_calloc_with_strinfields()); when
this is done, the stringfield pool cannot be separately freed, but users of the tructure
may not be aware (and shouldn't have to be aware) of whether the pool was embedded.
This patch modifies the behavior so that they can always call ast_string_field_free_memory()
and the function will do the right thing for both embedded and non-embedded situations.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@197775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2009-05-28 20:36:49 +00:00
parent 3eab939301
commit e4dafd3d0b
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/utils.c
View File

@@ -1559,11 +1559,17 @@ int __ast_string_field_init(struct ast_string_field_mgr *mgr, struct ast_string_
return add_string_pool(mgr, pool_head, needed, file, lineno, func); return add_string_pool(mgr, pool_head, needed, file, lineno, func);
} }
if (needed < 0) { /* reset all pools */ /* if there is an embedded pool, we can't actually release *all*
if (*pool_head == NULL) { * pools, we must keep the embedded one. if the caller is about
ast_log(LOG_WARNING, "trying to reset empty pool\n"); * to free the structure that contains the stringfield manager
return -1; * and embedded pool anyway, it will be freed as part of that
* operation.
*/
if ((needed < 0) && mgr->embedded_pool) {
needed = 0;
} }
if (needed < 0) { /* reset all pools */
cur = *pool_head; cur = *pool_head;
} else if (mgr->embedded_pool) { /* preserve the embedded pool */ } else if (mgr->embedded_pool) { /* preserve the embedded pool */
preserve = mgr->embedded_pool; preserve = mgr->embedded_pool;