[svn-commits] dvossel: trunk r219520 - in /trunk: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Fri Sep 18 18:20:58 2009
New Revision: 219520

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=219520
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=219520&r1=219519&r2=219520
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Fri Sep 18 18:20:58 2009
@@ -1685,6 +1685,7 @@
 static void iax2_frame_free(struct iax_frame *fr)
 {
 	ast_sched_thread_del(sched, fr->retrans);
+	fr->retrans = -1;
 	iax_frame_free(fr);
 }
 
@@ -3352,7 +3353,6 @@
 		/* Don't attempt delivery, just remove it from the queue */
 		AST_LIST_REMOVE(&frame_queue[callno], f, list);
 		ast_mutex_unlock(&iaxsl[callno]);
-		f->retrans = -1;
 		/* Free the IAX frame */
 		iax2_frame_free(f);
 	} else if (callno) {