From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 17 Jul 2007 20:42:50 +0000 (+0000)
Subject: Merged revisions 75441 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2042
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=681e45f0b2857f3e8b2401b7b2b6c0815d2a9438;p=thirdparty%2Fasterisk.git

Merged revisions 75441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r75441 | russell | 2007-07-17 15:42:12 -0500 (Tue, 17 Jul 2007) | 12 lines

Merged revisions 75440 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r75440 | russell | 2007-07-17 15:41:41 -0500 (Tue, 17 Jul 2007) | 4 lines

After parsing information elements in IAX frames, set the data length to zero,
so that code later on does not think it has data to copy.
(ASA-2007-015)

........

................


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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index eb804a8543..d9bd552a10 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -7093,6 +7093,7 @@ static int socket_process(struct iax2_thread *thread)
 					return 1;
 				}
 				f.data = NULL;
+				f.datalen = 0;
 			} else
 				f.data = thread->buf + sizeof(*fh);
 		} else {