kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 02:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

stringfields: Fix bug in ast_string_fields_copy.

Browse Source 
ast_string_fields_copy relies on the fact that
__ast_string_field_release_active never previously
zeroed pool->used, so keeping the existing pointer
was "ok".  Now that existing pools can be reset to
'empty', it is important to set each field to
__ast_string_field_empty after releasing the memory.

ASTERISK-24535 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4186/
........

Merged revisions 428272 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@428273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Corey Farrell
2014-11-19 19:31:13 +00:00
parent 524588c345
commit 8fb20cb05d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/asterisk/stringfields.h
View File

@@ -438,10 +438,11 @@ void __ast_string_field_release_active(struct ast_string_field_pool *pool_head,
int __len__ = ((void *)&(copy)->__field_mgr - (void *)&(copy)->__field_mgr_pool)/__ptr_size__ - 1; \ int __len__ = ((void *)&(copy)->__field_mgr - (void *)&(copy)->__field_mgr_pool)/__ptr_size__ - 1; \
int __len2__ = ((void *)&(orig)->__field_mgr - (void *)&(orig)->__field_mgr_pool)/__ptr_size__ - 1; \ int __len2__ = ((void *)&(orig)->__field_mgr - (void *)&(orig)->__field_mgr_pool)/__ptr_size__ - 1; \
if (__len__ == __len2__) { \ if (__len__ == __len2__) { \
char **__copy_head__ = (void *)&(copy)->__field_mgr_pool + __ptr_size__; \ ast_string_field *__copy_head__ = (void *)&(copy)->__field_mgr_pool + __ptr_size__; \
char **__orig_head__ = (void *)&(orig)->__field_mgr_pool + __ptr_size__; \ ast_string_field *__orig_head__ = (void *)&(orig)->__field_mgr_pool + __ptr_size__; \
for (__len2__ -= 1; __len2__ >= 0; __len2__--) { \ for (__len2__ -= 1; __len2__ >= 0; __len2__--) { \
__ast_string_field_release_active((copy)->__field_mgr_pool, __copy_head__[__len2__]); \ __ast_string_field_release_active((copy)->__field_mgr_pool, __copy_head__[__len2__]); \
__copy_head__[__len2__] = __ast_string_field_empty; \
} \ } \
for (__len__ -= 1; __len__ >= 0; __len__--) { \ for (__len__ -= 1; __len__ >= 0; __len__--) { \
if (ast_string_field_ptr_set((copy), &__copy_head__[__len__], __orig_head__[__len__])) { \ if (ast_string_field_ptr_set((copy), &__copy_head__[__len__], __orig_head__[__len__])) { \