summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-09-28 11:31:14 -0700
committerLior Kaplan <kaplanlior@gmail.com>2016-07-05 10:59:02 +0200
commite1ba58f068f4bfc8ced75bb017cd31d8beddf3c2 (patch)
treee79d43df7d076c2f56e91e1309b3308f59e488a4
parent25bd11cf271f801efa346195d540f3d8e3bcb0ef (diff)
downloadphp-git-e1ba58f068f4bfc8ced75bb017cd31d8beddf3c2.tar.gz
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
(cherry picked from commit 629e4da7cc8b174acdeab84969cbfc606a019b31)
-rw-r--r--ext/standard/url.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/url.c b/ext/standard/url.c
index fc3f080a41..b5739f0d7a 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) {