Merged revisions 75441 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 17 Jul 2007 20:42:50 +0000 (20:42 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 17 Jul 2007 20:42:50 +0000 (20:42 +0000)
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

channels/chan_iax2.c

index eb804a8..d9bd552 100644 (file)
@@ -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 {