diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-14 22:42:17 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-14 22:42:17 +0000 |
| commit | 89864095c8d4436d98f75d4a1c338b3c96fede1f (patch) | |
| tree | eb21c5f9de5ae6021204bac80e1e8380749c999e /main/chanvars.c | |
| parent | 04b34fd8e132320704f5f7daebba3948d93b2a3d (diff) | |
Merged revisions 149199 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r149199 | tilghman | 2008-10-14 17:38:06 -0500 (Tue, 14 Oct 2008) | 8 lines
Add additional memory debugging to several core APIs, and fix several memory
leaks found with these changes.
(Closes issue #13505, closes issue #13543)
Reported by: mav3rick, triccyx
Patches:
20081001__bug13505.diff.txt uploaded by Corydon76 (license 14)
Tested by: mav3rick, triccyx
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@149202 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/chanvars.c')
| -rw-r--r-- | main/chanvars.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/main/chanvars.c b/main/chanvars.c index 14a89f767..670858937 100644 --- a/main/chanvars.c +++ b/main/chanvars.c @@ -31,13 +31,21 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/strings.h" #include "asterisk/utils.h" +#ifdef MALLOC_DEBUG +struct ast_var_t *_ast_var_assign(const char *name, const char *value, const char *file, int lineno, const char *function) +#else struct ast_var_t *ast_var_assign(const char *name, const char *value) +#endif { struct ast_var_t *var; int name_len = strlen(name) + 1; int value_len = strlen(value) + 1; +#ifdef MALLOC_DEBUG + if (!(var = __ast_calloc(sizeof(*var) + name_len + value_len, sizeof(char), file, lineno, function))) { +#else if (!(var = ast_calloc(sizeof(*var) + name_len + value_len, sizeof(char)))) { +#endif return NULL; } |