com php-src: Fix bug #70480 (php_url_parse_ex() b uffer overflow read): ext/standard/url.c
| From: | JulienPauli | Date: | Tue, 05 Jul 2016 08:59:02 +0000 |
| Subject: | com php-src: Fix bug #70480 (php_url_parse_ex() b uffer overflow read): ext/standard/url.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92872@lists.php.net to get a copy of this message | ||
Commit: e1ba58f068f4bfc8ced75bb017cd31d8beddf3c2
Author: Stanislav Malyshev <stas@php.net> Mon, 28 Sep 2015 11:31:14 -0700
Committer: Lior Kaplan <kaplanlior@gmail.com> Tue, 5 Jul 2016 10:59:02 +0200
Parents: 25bd11cf271f801efa346195d540f3d8e3bcb0ef
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e1ba58f068f4bfc8ced75bb017cd31d8beddf3c2
Log:
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
(cherry picked from commit 629e4da7cc8b174acdeab84969cbfc606a019b31)
Bugs:
https://bugs.php.net/70480
Changed paths:
M ext/standard/url.c
Diff:
diff --git a/ext/standard/url.c b/ext/standard/url.c
index fc3f080..b5739f0 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -320,7 +320,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length)
nohost:
if ((p = memchr(s, '?', (ue - s)))) {
- pp = strchr(s, '#');
+ pp = memchr(s, '#', (ue - s));
if (pp && pp < p) {
if (pp - s) {