]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 89298 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 15 Nov 2007 18:11:36 +0000 (18:11 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 15 Nov 2007 18:11:36 +0000 (18:11 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89298 | tilghman | 2007-11-15 12:05:56 -0600 (Thu, 15 Nov 2007) | 5 lines

Yet another memory corruption issue.
Reported by: atis
Patch by: tilghman
Fixes issue #10923

........

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

channels/chan_iax2.c

index 729b89db52005730cc5b55973d87b1e047fe3849..ce533a25046dbaef8cc909d0c2223d2f6fb8f375 100644 (file)
@@ -9096,6 +9096,18 @@ static void *iax2_process_thread(void *data)
                handle_deferred_full_frames(thread);
        }
 
+       /*!\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.
+        */
+       AST_LIST_LOCK(&idle_list);
+       AST_LIST_REMOVE(&idle_list, thread, list);
+       AST_LIST_UNLOCK(&idle_list);
+
+       AST_LIST_LOCK(&dynamic_list);
+       AST_LIST_REMOVE(&dynamic_list, thread, list);
+       AST_LIST_UNLOCK(&dynamic_list);
+
        /* 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)
        */