diff options
| author | Mateusz Kocielski <shm@php.net> | 2014-03-18 08:57:30 +0100 |
|---|---|---|
| committer | Mateusz Kocielski <shm@php.net> | 2014-03-18 08:57:30 +0100 |
| commit | 156cc39e21cb5badbad11d42b5aa37e7b917f2a5 (patch) | |
| tree | 119b1cd5cf94fc94ffcf679cc57fce84b425ebdc | |
| parent | 66bf216c66b36c3a5379368747f21470b4dd3d27 (diff) | |
| parent | 497b918e6213264402758089b04dad34c24bf2f3 (diff) | |
| download | php-git-156cc39e21cb5badbad11d42b5aa37e7b917f2a5.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 == ':') { |