diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-11 03:25:04 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-11 03:25:04 +0000 |
| commit | d16c3fd4ca7637d33efa163106630a4110f7a448 (patch) | |
| tree | 0cd32982e8825620c5d5bf61f85e3830118f357f /apps | |
| parent | 8e1667bc2d6b310744333ee2e30fd331fd66c70d (diff) | |
Fix malloc debug macros to work properly with h323.
The main problem here was that cstdlib was undefining free thereby causing the
proper debug macros to not be used. ast_h323.cxx has been changed to call
ast_free instead to avoid the issue. Because using the ast prefix calls are
a better choice, ast_free_ptr is the new wrapper for free to pass to functions.
Also, a little bit of clean up was done to avoid the debug macros intentionally
being redefined.
(closes issue #13593)
Reported by: pj
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@181133 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 4d6a9ce50..67c851a2c 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -4729,7 +4729,7 @@ static int sla_build_trunk(struct ast_config *cfg, const char *cat) return -1; } if (ast_add_extension2(context, 0 /* don't replace */, "s", 1, - NULL, NULL, slatrunk_app, ast_strdup(trunk->name), ast_free, sla_registrar)) { + NULL, NULL, slatrunk_app, ast_strdup(trunk->name), ast_free_ptr, sla_registrar)) { ast_log(LOG_ERROR, "Failed to automatically create extension " "for trunk '%s'!\n", trunk->name); destroy_trunk(trunk); @@ -4868,7 +4868,7 @@ static int sla_build_station(struct ast_config *cfg, const char *cat) /* The extension for when the handset goes off-hook. * exten => station1,1,SLAStation(station1) */ if (ast_add_extension2(context, 0 /* don't replace */, station->name, 1, - NULL, NULL, slastation_app, ast_strdup(station->name), ast_free, sla_registrar)) { + NULL, NULL, slastation_app, ast_strdup(station->name), ast_free_ptr, sla_registrar)) { ast_log(LOG_ERROR, "Failed to automatically create extension " "for trunk '%s'!\n", station->name); destroy_station(station); @@ -4883,7 +4883,7 @@ static int sla_build_station(struct ast_config *cfg, const char *cat) /* Extension for this line button * exten => station1_line1,1,SLAStation(station1_line1) */ if (ast_add_extension2(context, 0 /* don't replace */, exten, 1, - NULL, NULL, slastation_app, ast_strdup(exten), ast_free, sla_registrar)) { + NULL, NULL, slastation_app, ast_strdup(exten), ast_free_ptr, sla_registrar)) { ast_log(LOG_ERROR, "Failed to automatically create extension " "for trunk '%s'!\n", station->name); destroy_station(station); |