diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2009-11-23 14:15:48 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-11-23 14:15:48 +0000 |
| commit | 1f759eddfa1f8cb66877298e2fca08d1a981d6de (patch) | |
| tree | f054b491a428400b065219943e6defa0b7d18301 /channels/chan_sip.c | |
| parent | 417657f4ed32a829383c1469b7adde18d991ebf5 (diff) | |
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/trunk@230773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 66262e6e2..fb0c939cf 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7113,7 +7113,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; @@ -7123,15 +7123,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)++]); |