summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateusz Kocielski <shm@php.net>2014-03-18 08:48:41 +0100
committerMateusz Kocielski <shm@php.net>2014-03-18 08:48:41 +0100
commit46566b78c9811b24e9339a6652e26bbf48a80585 (patch)
tree3205de8427834510cbddbfd38944ff37f389d543
parent4b48b299885bf0e2f2c72902b072c28f255e8f68 (diff)
downloadphp-git-46566b78c9811b24e9339a6652e26bbf48a80585.tar.gz
Fixed off-by-one in php_url_parse_ex
Change order of condition, previously pointer could be derefrenced before bound check was done.
-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 fd5bcb402e..1c158071e1 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -263,7 +263,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length)
} else {
/* memrchr is a GNU specific extension
Emulate for wide compatability */
- for(p = e; *p != ':' && p >= s; p--);
+ for(p = e; p >= s && *p != ':'; p--);
}
if (p >= s && *p == ':') {