diff options
-rw-r--r-- | ext/standard/tests/url/parse_url_basic_001.phpt | 9 | ||||
-rw-r--r-- | ext/standard/tests/url/parse_url_basic_002.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/url/parse_url_basic_003.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/url/parse_url_basic_004.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/url/parse_url_basic_005.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/url/parse_url_basic_006.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/url/parse_url_basic_007.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/url/parse_url_basic_008.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/url/parse_url_basic_009.phpt | 1 | ||||
-rw-r--r-- | ext/standard/tests/url/parse_url_unterminated.phpt | 9 | ||||
-rw-r--r-- | ext/standard/tests/url/urls.inc | 1 | ||||
-rw-r--r-- | ext/standard/url.c | 10 |
12 files changed, 33 insertions, 4 deletions
diff --git a/ext/standard/tests/url/parse_url_basic_001.phpt b/ext/standard/tests/url/parse_url_basic_001.phpt index 3f2b5511bd..aa83a69319 100644 --- a/ext/standard/tests/url/parse_url_basic_001.phpt +++ b/ext/standard/tests/url/parse_url_basic_001.phpt @@ -873,6 +873,15 @@ echo "Done"; string(3) "%:x" } +--> https://example.com:0/: array(3) { + ["scheme"]=> + string(5) "https" + ["host"]=> + string(11) "example.com" + ["path"]=> + string(1) "/" +} + --> http:///blah.com: bool(false) --> http://:80: bool(false) diff --git a/ext/standard/tests/url/parse_url_basic_002.phpt b/ext/standard/tests/url/parse_url_basic_002.phpt index f2e3f236a0..a9a0d5a602 100644 --- a/ext/standard/tests/url/parse_url_basic_002.phpt +++ b/ext/standard/tests/url/parse_url_basic_002.phpt @@ -107,6 +107,7 @@ echo "Done"; --> / : NULL --> /rest/Users?filter={"id":"123"} : NULL --> %:x : NULL +--> https://example.com:0/ : string(5) "https" --> http:///blah.com : bool(false) --> http://:80 : bool(false) --> http://user@:80 : bool(false) diff --git a/ext/standard/tests/url/parse_url_basic_003.phpt b/ext/standard/tests/url/parse_url_basic_003.phpt index c685422185..1eb64d6a1b 100644 --- a/ext/standard/tests/url/parse_url_basic_003.phpt +++ b/ext/standard/tests/url/parse_url_basic_003.phpt @@ -106,6 +106,7 @@ echo "Done"; --> / : NULL --> /rest/Users?filter={"id":"123"} : NULL --> %:x : NULL +--> https://example.com:0/ : string(11) "example.com" --> http:///blah.com : bool(false) --> http://:80 : bool(false) --> http://user@:80 : bool(false) diff --git a/ext/standard/tests/url/parse_url_basic_004.phpt b/ext/standard/tests/url/parse_url_basic_004.phpt index a1d9225c50..4bc6adc1b9 100644 --- a/ext/standard/tests/url/parse_url_basic_004.phpt +++ b/ext/standard/tests/url/parse_url_basic_004.phpt @@ -106,6 +106,7 @@ echo "Done"; --> / : NULL --> /rest/Users?filter={"id":"123"} : NULL --> %:x : NULL +--> https://example.com:0/ : NULL --> http:///blah.com : bool(false) --> http://:80 : bool(false) --> http://user@:80 : bool(false) diff --git a/ext/standard/tests/url/parse_url_basic_005.phpt b/ext/standard/tests/url/parse_url_basic_005.phpt index a8c982877a..dfbe7e7971 100644 --- a/ext/standard/tests/url/parse_url_basic_005.phpt +++ b/ext/standard/tests/url/parse_url_basic_005.phpt @@ -106,6 +106,7 @@ echo "Done"; --> / : NULL --> /rest/Users?filter={"id":"123"} : NULL --> %:x : NULL +--> https://example.com:0/ : NULL --> http:///blah.com : bool(false) --> http://:80 : bool(false) --> http://user@:80 : bool(false) diff --git a/ext/standard/tests/url/parse_url_basic_006.phpt b/ext/standard/tests/url/parse_url_basic_006.phpt index ac71994afb..49f139f145 100644 --- a/ext/standard/tests/url/parse_url_basic_006.phpt +++ b/ext/standard/tests/url/parse_url_basic_006.phpt @@ -106,6 +106,7 @@ echo "Done"; --> / : NULL --> /rest/Users?filter={"id":"123"} : NULL --> %:x : NULL +--> https://example.com:0/ : NULL --> http:///blah.com : bool(false) --> http://:80 : bool(false) --> http://user@:80 : bool(false) diff --git a/ext/standard/tests/url/parse_url_basic_007.phpt b/ext/standard/tests/url/parse_url_basic_007.phpt index 379ac9ac7c..8d7de1d0fb 100644 --- a/ext/standard/tests/url/parse_url_basic_007.phpt +++ b/ext/standard/tests/url/parse_url_basic_007.phpt @@ -106,6 +106,7 @@ echo "Done"; --> / : string(1) "/" --> /rest/Users?filter={"id":"123"} : string(11) "/rest/Users" --> %:x : string(3) "%:x" +--> https://example.com:0/ : string(1) "/" --> http:///blah.com : bool(false) --> http://:80 : bool(false) --> http://user@:80 : bool(false) diff --git a/ext/standard/tests/url/parse_url_basic_008.phpt b/ext/standard/tests/url/parse_url_basic_008.phpt index afb648dcf2..9080523f50 100644 --- a/ext/standard/tests/url/parse_url_basic_008.phpt +++ b/ext/standard/tests/url/parse_url_basic_008.phpt @@ -106,6 +106,7 @@ echo "Done"; --> / : NULL --> /rest/Users?filter={"id":"123"} : string(19) "filter={"id":"123"}" --> %:x : NULL +--> https://example.com:0/ : NULL --> http:///blah.com : bool(false) --> http://:80 : bool(false) --> http://user@:80 : bool(false) diff --git a/ext/standard/tests/url/parse_url_basic_009.phpt b/ext/standard/tests/url/parse_url_basic_009.phpt index 9425e57955..e37dee6dac 100644 --- a/ext/standard/tests/url/parse_url_basic_009.phpt +++ b/ext/standard/tests/url/parse_url_basic_009.phpt @@ -106,6 +106,7 @@ echo "Done"; --> / : NULL --> /rest/Users?filter={"id":"123"} : NULL --> %:x : NULL +--> https://example.com:0/ : NULL --> http:///blah.com : bool(false) --> http://:80 : bool(false) --> http://user@:80 : bool(false) diff --git a/ext/standard/tests/url/parse_url_unterminated.phpt b/ext/standard/tests/url/parse_url_unterminated.phpt index 86b9d0e1f1..9ab0c887c8 100644 --- a/ext/standard/tests/url/parse_url_unterminated.phpt +++ b/ext/standard/tests/url/parse_url_unterminated.phpt @@ -881,6 +881,15 @@ echo "Done"; string(3) "%:x" } +--> https://example.com:0/: array(3) { + ["scheme"]=> + string(5) "https" + ["host"]=> + string(11) "example.com" + ["path"]=> + string(1) "/" +} + --> http:///blah.com: bool(false) --> http://:80: bool(false) diff --git a/ext/standard/tests/url/urls.inc b/ext/standard/tests/url/urls.inc index 199f22caea..d334f4e9ab 100644 --- a/ext/standard/tests/url/urls.inc +++ b/ext/standard/tests/url/urls.inc @@ -92,6 +92,7 @@ $urls = array( '/', '/rest/Users?filter={"id":"123"}', '%:x', +'https://example.com:0/', // Severely malformed URLs that do not parse: 'http:///blah.com', diff --git a/ext/standard/url.c b/ext/standard/url.c index 1d4869ecd4..b24fe8ecf8 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -183,10 +183,11 @@ PHPAPI php_url *php_url_parse_ex(char const *str, size_t length) if (pp - p > 0 && pp - p < 6 && (pp == ue || *pp == '/')) { zend_long port; + char *end; memcpy(port_buf, p, (pp - p)); port_buf[pp - p] = '\0'; - port = ZEND_STRTOL(port_buf, NULL, 10); - if (port > 0 && port <= 65535) { + port = ZEND_STRTOL(port_buf, &end, 10); + if (port >= 0 && port <= 65535 && end != port_buf) { ret->port = (unsigned short) port; if (s + 1 < ue && *s == '/' && *(s + 1) == '/') { /* relative-scheme URL */ s += 2; @@ -247,10 +248,11 @@ parse_host: return NULL; } else if (e - p > 0) { zend_long port; + char *end; memcpy(port_buf, p, (e - p)); port_buf[e - p] = '\0'; - port = ZEND_STRTOL(port_buf, NULL, 10); - if (port > 0 && port <= 65535) { + port = ZEND_STRTOL(port_buf, &end, 10); + if (port >= 0 && port <= 65535 && end != port_buf) { ret->port = (unsigned short)port; } else { php_url_free(ret); |