summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2011-08-11 13:01:52 +0000
committerIlia Alshanetsky <iliaa@php.net>2011-08-11 13:01:52 +0000
commitcc93e8e51fd66e1523c6ab1baede83d51bd29c0d (patch)
treebc830ee8dae4ff3aabb58468417850a69e55a86c
parentbeea66d595227bd310faa1dfd79b6a0bd06bd63d (diff)
downloadphp-git-cc93e8e51fd66e1523c6ab1baede83d51bd29c0d.tar.gz
Fixed bug #55399 (parse_url() incorrectly treats ':' as a valid path)
-rw-r--r--ext/standard/tests/url/bug55399.phpt10
-rw-r--r--ext/standard/url.c4
2 files changed, 14 insertions, 0 deletions
diff --git a/ext/standard/tests/url/bug55399.phpt b/ext/standard/tests/url/bug55399.phpt
new file mode 100644
index 0000000000..619c08da6d
--- /dev/null
+++ b/ext/standard/tests/url/bug55399.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Bug #55399 (parse_url() incorrectly treats ':' as a valid path)
+--FILE--
+<?php
+
+var_dump(parse_url(":"));
+
+?>
+--EXPECT--
+bool(false)
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 0f4b836e62..da6d4e89d0 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -197,6 +197,10 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length)
efree(ret);
return NULL;
}
+ } else if (p == pp && *pp == '\0') {
+ STR_FREE(ret->scheme);
+ efree(ret);
+ return NULL;
} else {
goto just_path;
}