]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix joinable thread terminating without joiner memory leak in chan_iax.c.
authorRichard Mudgett <rmudgett@digium.com>
Mon, 9 Jan 2012 21:54:01 +0000 (21:54 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Mon, 9 Jan 2012 21:54:01 +0000 (21:54 +0000)
The iax2_process_thread() can exit without anyone waiting to join the
thread.  If noone is waiting to join the thread then a large memory leak
occurs.

* Made iax2_process_thread() deatach itself if nobody is waiting to join
the thread.

(closes issue ASTERISK-17339)
Reported by: Tzafrir Cohen
Patches:
      asterisk-1.8.4.4-chan_iax2-detach-thread-on-non-stop-exit.patch (license #5617) patch uploaded by Alex Villacis Lasso (modified)

(closes issue ASTERISK-17825)
Reported by: wangjin

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

channels/chan_iax2.c

index a9a9dec2529269c5839509b5c707b2e8fc4ed0a6..bc6afce7e47e6934b7587f414b34e8ac54c07a27 100644 (file)
@@ -11733,7 +11733,8 @@ static void *iax2_process_thread(void *data)
                handle_deferred_full_frames(thread);
        }
 
-       /*!\note For some reason, idle threads are exiting without being removed
+       /*!
+        * \note For some reason, idle threads are exiting without being removed
         * from an idle list, which is causing memory corruption.  Forcibly remove
         * it from the list, if it's there.
         */
@@ -11745,6 +11746,11 @@ static void *iax2_process_thread(void *data)
        AST_LIST_REMOVE(&dynamic_list, thread, list);
        AST_LIST_UNLOCK(&dynamic_list);
 
+       if (!thread->stop) {
+               /* Nobody asked me to stop so nobody is waiting to join me. */
+               pthread_detach(pthread_self());
+       }
+
        /* I am exiting here on my own volition, I need to clean up my own data structures
        * Assume that I am no longer in any of the lists (idle, active, or dynamic)
        */