diff options
| author | Mateusz Kocielski <shm@php.net> | 2014-03-18 09:53:58 +0100 |
|---|---|---|
| committer | Mateusz Kocielski <shm@php.net> | 2014-03-18 09:53:58 +0100 |
| commit | 888f467d63ba6d35d3d2142747b04870e94824a3 (patch) | |
| tree | d650c4c22eef89e12b9fde77eff5d06ce7095b9e | |
| parent | ccae70b7650046fd5692a15b7148dac1862a65a3 (diff) | |
| parent | 156cc39e21cb5badbad11d42b5aa37e7b917f2a5 (diff) | |
| download | php-git-888f467d63ba6d35d3d2142747b04870e94824a3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed off-by-one in php_url_parse_ex
| -rw-r--r-- | ext/standard/url.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/url.c b/ext/standard/url.c index e4eb9c48b9..d8271a18ed 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -266,8 +266,8 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length) p = s; } else { /* memrchr is a GNU specific extension - Emulate for wide compatibility */ - for(p = e; *p != ':' && p >= s; p--); + Emulate for wide compatability */ + for(p = e; p >= s && *p != ':'; p--); } if (p >= s && *p == ':') { |