diff options
author | Riza Sulistyo <riza@teluu.com> | 2015-06-12 03:07:05 +0000 |
---|---|---|
committer | Riza Sulistyo <riza@teluu.com> | 2015-06-12 03:07:05 +0000 |
commit | b780811fae0b25e08a6cfa5198d9ccdac4114aed (patch) | |
tree | 245d613e452acb144adea52ca67a34cd10b439b2 /pjsip | |
parent | 12171fa04c4254fd587ae10b43c67750716a0386 (diff) |
Misc (re #1843): Fix the possibility of crash when parsing multipart message.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5107 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
-rw-r--r-- | pjsip/src/pjsip/sip_multipart.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pjsip/src/pjsip/sip_multipart.c b/pjsip/src/pjsip/sip_multipart.c index 80a9bea0..9bd64966 100644 --- a/pjsip/src/pjsip/sip_multipart.c +++ b/pjsip/src/pjsip/sip_multipart.c @@ -548,7 +548,11 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_parse(pj_pool_t *pool, */ for (;;) { while (p!=end && *p!='-') ++p; - if (p!=end && *(p+1)=='-' && + + if (p == end) + break; + + if ((p+1<end) && *(p+1)=='-' && ((p>buf && *(p-1)=='\n') || (p==buf))) { p+=2; |