automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38307 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d1e0a2b16ad87643e3cef5d677b295af1e60598e..c919c8968caf5d58af9ca540b58b4106bab2fa6a 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -980,6 +980,15 @@ static const struct ast_channel_tech sip_tech = {
        .send_text = sip_sendtext,
 };
 
+#ifdef __AST_DEBUG_MALLOC
+static void FREE(void *ptr)
+{
+       free(ptr);
+}
+#else
+#define FREE free
+#endif
+
 /*!
   \brief Thread-safe random number generator
   \return a random number
@@ -1652,7 +1661,7 @@ static void register_peer_exten(struct sip_peer *peer, int onoff)
                stringp = multi;
                while((ext = strsep(&stringp, "&"))) {
                        if (onoff)
-                               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);
                }