From 2556ab814e9ba21d7deed40e905256d55de15479 Mon Sep 17 00:00:00 2001 From: David Vossel Date: Fri, 18 Sep 2009 23:23:20 +0000 Subject: [PATCH] Merged revisions 219520 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r219520 | dvossel | 2009-09-18 18:20:58 -0500 (Fri, 18 Sep 2009) | 15 lines Merged revisions 219519 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r219519 | dvossel | 2009-09-18 18:19:50 -0500 (Fri, 18 Sep 2009) | 9 lines iax2 frame double free The iax frame's retrans sched id was written over right before iax2_frame_free was called. In iax2_frame_free that retrans id is used to delete the sched item. By writing over the retrans field before the sched item could be deleted, it was possible for a retransmit to occur on a freed frame. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219523 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 913c179d74..28e828c3b6 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -1493,6 +1493,7 @@ static void iax2_destroy_helper(struct chan_iax2_pvt *pvt) static void iax2_frame_free(struct iax_frame *fr) { AST_SCHED_DEL(sched, fr->retrans); + fr->retrans = -1; iax_frame_free(fr); } @@ -3164,7 +3165,6 @@ static void __attempt_transmit(const void *data) AST_LIST_LOCK(&frame_queue); AST_LIST_REMOVE(&frame_queue, f, list); AST_LIST_UNLOCK(&frame_queue); - f->retrans = -1; /* Free the IAX frame */ iax2_frame_free(f); } -- 2.47.2