[svn-commits] dvossel: branch 10 r330586 - in /branches/10: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue Aug  2 11:17:59 2011
New Revision: 330586

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=330586
Log:
Merged revisions 330581 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r330581 | dvossel | 2011-08-02 11:15:08 -0500 (Tue, 02 Aug 2011) | 8 lines
  
  Fixes crash in chan_iax2.
  
  Fixes crash in chan_iax2 resulting from an edge case in the
  way control frames are queued during calltoken negotiation is complete.
  
  (closes issue ASTERISK-17610)
  Reported by: mgrobecker
........

Modified:
    branches/10/   (props changed)
    branches/10/channels/chan_iax2.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_iax2.c?view=diff&rev=330586&r1=330585&r2=330586
==============================================================================
--- branches/10/channels/chan_iax2.c (original)
+++ branches/10/channels/chan_iax2.c Tue Aug  2 11:17:59 2011
@@ -1898,7 +1898,9 @@
 
 static void free_signaling_queue_entry(struct signaling_queue_entry *s)
 {
-	ast_free(s->f.data.ptr);
+	if (s->f.datalen) {
+		ast_free(s->f.data.ptr);
+	}
 	ast_free(s);
 }