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

Correct some flaws in the memory accounting code for stringfields and ao2 objects

Browse Source 
Under some conditions, the memory allocation for stringfields and ao2 objects would not have supplied valid file/function names for MALLOC_DEBUG tracking, so this commit corrects that.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@192357 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2009-05-05 13:18:21 +00:00
parent ec5116f80c
commit 1f49e675bb
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/stringfields.h
View File

@@ -244,7 +244,7 @@ void __ast_string_field_ptr_build_va(struct ast_string_field_mgr *mgr,
/*! \brief free all memory - to be called before destroying the object */ /*! \brief free all memory - to be called before destroying the object */
#define ast_string_field_free_memory(x) \ #define ast_string_field_free_memory(x) \
__ast_string_field_init(&(x)->__field_mgr, &(x)->__field_mgr_pool, -1, NULL, 0, NULL) __ast_string_field_init(&(x)->__field_mgr, &(x)->__field_mgr_pool, -1, __FILE__, __LINE__, __PRETTY_FUNCTION__)
/*! /*!
* \internal * \internal

2
main/astobj2.c
View File

@@ -358,7 +358,7 @@ void *__ao2_alloc_debug(size_t data_size, ao2_destructor_fn destructor_fn, char
void *__ao2_alloc(size_t data_size, ao2_destructor_fn destructor_fn) void *__ao2_alloc(size_t data_size, ao2_destructor_fn destructor_fn)
{ {
return internal_ao2_alloc(data_size, destructor_fn, NULL, 0, NULL); return internal_ao2_alloc(data_size, destructor_fn, __FILE__, __LINE__, __FUNCTION__);
} }

2
main/utils.c
View File

@@ -1605,7 +1605,7 @@ ast_string_field __ast_string_field_alloc_space(struct ast_string_field_mgr *mgr
if (add_string_pool(mgr, pool_head, new_size, mgr->owner_file, mgr->owner_line, mgr->owner_func)) if (add_string_pool(mgr, pool_head, new_size, mgr->owner_file, mgr->owner_line, mgr->owner_func))
return NULL; return NULL;
#else #else
if (add_string_pool(mgr, pool_head, new_size, NULL, 0, NULL)) if (add_string_pool(mgr, pool_head, new_size, __FILE__, __LINE__, __FUNCTION__))
return NULL; return NULL;
#endif #endif
} }