diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-30 17:06:18 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-30 17:06:18 +0000 |
| commit | acbb9ec1466d5bfb85484206e0bd120bb361a010 (patch) | |
| tree | 78482dccfe86cba22169a8f7644d8147b36a7fd6 /channels | |
| parent | eb6fc28399523eaea896ecc25c610141e4eb0442 (diff) | |
Merged revisions 114899 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114899 | oej | 2008-04-30 18:55:49 +0200 (Ons, 30 Apr 2008) | 15 lines
Merged revisions 114890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114890 | oej | 2008-04-30 18:23:17 +0200 (Ons, 30 Apr 2008) | 7 lines
Don't crash on bad SIP replys.
Fix created in Huntsville together with Mark M (putnopvut)
(closes issue #12363)
Reported by: jvandal
Tested by: putnopvut, oej
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114900 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index ba4f6befc..65dd4bd44 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1925,7 +1925,7 @@ static const struct cfsubscription_types *find_subscription_type(enum subscripti static const char *gettag(const struct sip_request *req, const char *header, char *tagbuf, int tagbufsize); static int find_sip_method(const char *msg); static unsigned int parse_sip_options(struct sip_pvt *pvt, const char *supported); -static void parse_request(struct sip_request *req); +static int parse_request(struct sip_request *req); static const char *get_header(const struct sip_request *req, const char *name); static const char *referstatus2str(enum referstatus rstatus) attribute_pure; static int method_match(enum sipmethod id, const char *name); @@ -6124,7 +6124,7 @@ static int lws2sws(char *msgbuf, int len) /*! \brief Parse a SIP message \note this function is used both on incoming and outgoing packets */ -static void parse_request(struct sip_request *req) +static int parse_request(struct sip_request *req) { char *c = req->data, **dst = req->header; int i = 0, lim = SIP_MAX_HEADERS - 1; @@ -6174,7 +6174,7 @@ static void parse_request(struct sip_request *req) if (*c) ast_log(LOG_WARNING, "Too many lines, skipping <%s>\n", c); /* Split up the first line parts */ - determine_firstline_parts(req); + return determine_firstline_parts(req); } /*! @@ -18074,7 +18074,11 @@ static int handle_request_do(struct sip_request *req, struct sockaddr_in *sin) ntohs(sin->sin_port), req->data); } - parse_request(req); + if(parse_request(req) == -1) { /* Bad packet, can't parse */ + ast_str_reset(req->data); /* nulling this out is NOT a good idea here. */ + return 1; + } + req->method = find_sip_method(req->rlPart1); if (req->debug) |