From: David Vossel <dvossel@digium.com>
Date: Tue, 2 Aug 2011 16:17:59 +0000 (+0000)
Subject: Merged revisions 330581 via svnmerge from
X-Git-Tag: 10.0.0-beta2~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e60c8ae0d084e6c59f0840ec6956c25ff5db5b15;p=thirdparty%2Fasterisk.git

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
........


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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index dff1bfda21..9b3b4cf372 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1898,7 +1898,9 @@ static int scheduled_destroy(const void *vid)
 
 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);
 }