aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-15 20:10:20 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-15 20:10:20 +0000
commit7f80506a26ff4db5269785d484c370c52d510b9f (patch)
tree992a7c1f4752c9e3b3ef55f30daea817e2f49231
parentaf7531177623acbd1297bd5b8cebe7cac9d5621a (diff)
Merged revisions 98934 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r98934 | file | 2008-01-15 16:08:43 -0400 (Tue, 15 Jan 2008) | 4 lines Based on the boundary found move over the correct amount. (closes issue #11750) Reported by: tasker ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@98935 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_sip.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index fd6e75636..4018045f8 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -5584,10 +5584,13 @@ static int find_sdp(struct sip_request *req)
return 0;
/* if there is no boundary marker, it's invalid */
- if (!(search = strcasestr(content_type, ";boundary=")) && (!(search = strcasestr(content_type, "; boundary="))))
+ if ((search = strcasestr(content_type, ";boundary=")))
+ search += 10;
+ else if ((search = strcasestr(content_type, "; boundary=")))
+ search += 11;
+ else
return 0;
- search += 10;
if (ast_strlen_zero(search))
return 0;