diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-05 13:23:27 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-05 13:23:27 +0000 |
| commit | 58e23ec2fbf82dc5f10344293061f622a04f688b (patch) | |
| tree | bbdc823e252e866803e97abff9a39b7f73886665 | |
| parent | b1ee3cb350dd9f9201c3587a76f6cf7fdcf3f8ae (diff) | |
Merged revisions 192357 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r192357 | kpfleming | 2009-05-05 15:18:21 +0200 (Tue, 05 May 2009) | 5 lines
Correct some flaws in the memory accounting code for stringfields and ao2 objects
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@192358 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk/stringfields.h | 2 | ||||
| -rw-r--r-- | main/utils.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/stringfields.h b/include/asterisk/stringfields.h index f3b44fd94..03b573287 100644 --- a/include/asterisk/stringfields.h +++ b/include/asterisk/stringfields.h @@ -243,7 +243,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 */ #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 diff --git a/main/utils.c b/main/utils.c index 8aba624d8..554da57d8 100644 --- a/main/utils.c +++ b/main/utils.c @@ -1468,7 +1468,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)) return NULL; #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; #endif } |