From 228c35198ca9374865d24b832835a8bf46fab9ed Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 27 Jul 2006 04:25:41 +0000 Subject: [PATCH] Fix crash when using the "regexten" option with MALLOC_DEBUG enabled. This was not reported in the bug tracker but the same bug has been demonstrated in other places in the code. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@38328 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 576ca6351b..d1e33f408d 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -663,6 +663,15 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in static void destroy_peer(struct iax2_peer *peer); static int ast_cli_netstats(int fd, int limit_fmt); +#ifdef __AST_DEBUG_MALLOC +static void FREE(void *ptr) +{ + free(ptr); +} +#else +#define FREE free +#endif + static void iax_debug_output(const char *data) { if (iaxdebug) @@ -5627,7 +5636,7 @@ static void register_peer_exten(struct iax2_peer *peer, int onoff) while((ext = strsep(&stringp, "&"))) { if (onoff) { if (!ast_exists_extension(NULL, regcontext, ext, 1, NULL)) - ast_add_extension(regcontext, 1, ext, 1, NULL, NULL, "Noop", strdup(peer->name), free, channeltype); + ast_add_extension(regcontext, 1, ext, 1, NULL, NULL, "Noop", strdup(peer->name), FREE, channeltype); } else ast_context_remove_extension(regcontext, ext, 1, NULL); } -- 2.47.2