com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/url.c
| From: | Stanislav Malyshev | Date: | Mon, 28 Sep 2015 20:08:44 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/standard/url.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89188@lists.php.net to get a copy of this message | ||
Commit: 899753f24089e27c7f2a7f169aa042564d6f6a63
Author: Stanislav Malyshev <stas@php.net> Mon, 28 Sep 2015 13:08:44 -0700
Parents: be6546fac9d2f58175e609cbacf1abcbaacdbf08 629e4da7cc8b174acdeab84969cbfc606a019b31
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=899753f24089e27c7f2a7f169aa042564d6f6a63
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
Bugs:
https://bugs.php.net/70480
Changed paths:
MM ext/standard/url.c
Diff:
diff --cc ext/standard/url.c
index 1c9e9a6,28ccba0..8609e11
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@@ -314,13 -314,13 +314,13 @@@ PHPAPI php_url *php_url_parse_ex(char c
if (e == ue) {
return ret;
}
-
+
s = e;
-
+
nohost:
-
+
if ((p = memchr(s, '?', (ue - s)))) {
- pp = strchr(s, '#');
+ pp = memchr(s, '#', (ue - s));
if (pp && pp < p) {
if (pp - s) {