From: Stanislav Malyshev <stas@php.net>
Date: Mon, 28 Sep 2015 20:08:44 +0000 (-0700)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.0RC4~4^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=899753f24089e27c7f2a7f169aa042564d6f6a63;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #70480 (php_url_parse_ex() buffer overflow read)
---

899753f24089e27c7f2a7f169aa042564d6f6a63
diff --cc ext/standard/url.c
index 1c9e9a6e4c,28ccba0c81..8609e11e0e
--- 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) {