From: Kevin P. Fleming <kpfleming@digium.com>
Date: Mon, 23 Nov 2009 14:20:42 +0000 (+0000)
Subject: Merged revisions 230773 via svnmerge from
X-Git-Tag: 1.6.1.12-rc1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c4c2e2753325ed6caf26d51e4db3a3bee74447c;p=thirdparty%2Fasterisk.git

Merged revisions 230773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r230773 | kpfleming | 2009-11-23 08:15:48 -0600 (Mon, 23 Nov 2009) | 12 lines

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

  ........
    r230772 | kpfleming | 2009-11-23 08:13:56 -0600 (Mon, 23 Nov 2009) | 5 lines

    Ensure that SDP parsing does not ignore the last line of the SDP.

    (closes issue #16268)
    Reported by: sgimeno
  ........
................


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7674243c93..92caa054ab 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6361,7 +6361,7 @@ static const char *get_sdp_iterate(int *start, struct sip_request *req, const ch
 {
 	int len = strlen(name);
 
-	while (*start < req->sdp_end) {
+	while (*start <= req->sdp_end) {
 		const char *r = get_body_by_line(REQ_OFFSET_TO_STR(req, line[(*start)++]), name, len);
 		if (r[0] != '\0')
 			return r;
@@ -6371,15 +6371,16 @@ static const char *get_sdp_iterate(int *start, struct sip_request *req, const ch
 }
 
 /*! \brief Fetches the next valid SDP line between the 'start' line
- * and the 'stop' line. Returns the type ('a', 'c', ...) and 
- * matching line in reference 'start' is updated with the next line number.
+ * and the 'stop' line (*excluding* the 'stop' line). Returns the type
+ * ('a', 'c', ...) and matching line in reference 'start' is updated with the
+ * next line number.
  */
 static char get_sdp_line(int *start, int stop, struct sip_request *req, const char **value)
 {
 	char type = '\0';
 	const char *line = NULL;
 
-	if (stop > req->sdp_end || stop < req->sdp_start) stop = req->sdp_end;
+	if (stop > req->sdp_end || stop < req->sdp_start) stop = req->sdp_end + 1;
 
 	while (*start < stop) {
 		line = REQ_OFFSET_TO_STR(req, line[(*start)++]);