clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4' into PHP-8.0

Browse Source 
* PHP-7.4:
  Fix #80266: parse_url silently drops port number 0
This commit is contained in:
Christoph M. Becker 2020-11-04 14:56:54 +01:00
commit b8f2531ff0
6 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -25,6 +25,7 @@ PHP NEWS
variable by the HTTP stream wrapper. (Dmitry)
. Fixed bug #80290 (Double free when ASSERT_CALLBACK is used with a dynamic
message). (Nikita)
. Fixed bug #80266 (parse_url silently drops port number 0). (cmb, Nikita)
29 Oct 2020, PHP 8.0.0RC3

4
ext/standard/tests/url/parse_url_basic_001.phpt
View File

@ -873,11 +873,13 @@ echo "Done";
string(3) "%:x"
}
--> https://example.com:0/: array(3) {
--> https://example.com:0/: array(4) {
["scheme"]=>
string(5) "https"
["host"]=>
string(11) "example.com"
["port"]=>
int(0)
["path"]=>
string(1) "/"
}

2
ext/standard/tests/url/parse_url_basic_004.phpt
View File

@ -106,7 +106,7 @@ echo "Done";
--> / : NULL
--> /rest/Users?filter={"id":"123"} : NULL
--> %:x : NULL
--> https://example.com:0/ : NULL
--> https://example.com:0/ : int(0)
--> http:///blah.com : bool(false)
--> http://:80 : bool(false)
--> http://user@:80 : bool(false)

4
ext/standard/tests/url/parse_url_unterminated.phpt
View File

@ -881,11 +881,13 @@ echo "Done";
string(3) "%:x"
}
--> https://example.com:0/: array(3) {
--> https://example.com:0/: array(4) {
["scheme"]=>
string(5) "https"
["host"]=>
string(11) "example.com"
["port"]=>
int(0)
["path"]=>
string(1) "/"
}

18
ext/standard/url.c
View File

@ -94,11 +94,20 @@ static const char *binary_strcspn(const char *s, const char *e, const char *char
/* {{{ php_url_parse */
PHPAPI php_url *php_url_parse_ex(char const *str, size_t length)
{
zend_bool has_port;
return php_url_parse_ex2(str, length, &has_port);
}
/* {{{ php_url_parse_ex2
*/
PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, zend_bool *has_port)
{
char port_buf[6];
php_url *ret = ecalloc(1, sizeof(php_url));
char const *s, *e, *p, *pp, *ue;
*has_port = 0;
s = str;
ue = s + length;
@ -188,6 +197,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, size_t length)
port_buf[pp - p] = '\0';
port = ZEND_STRTOL(port_buf, &end, 10);
if (port >= 0 && port <= 65535 && end != port_buf) {
*has_port = 1;
ret->port = (unsigned short) port;
if (s + 1 < ue && *s == '/' && *(s + 1) == '/') { /* relative-scheme URL */
s += 2;
@ -253,6 +263,7 @@ parse_host:
port_buf[e - p] = '\0';
port = ZEND_STRTOL(port_buf, &end, 10);
if (port >= 0 && port <= 65535 && end != port_buf) {
*has_port = 1;
ret->port = (unsigned short)port;
} else {
php_url_free(ret);
@ -324,6 +335,7 @@ PHP_FUNCTION(parse_url)
php_url *resource;
zend_long key = -1;
zval tmp;
zend_bool has_port;
ZEND_PARSE_PARAMETERS_START(1, 2)
Z_PARAM_STRING(str, str_len)
@ -331,7 +343,7 @@ PHP_FUNCTION(parse_url)
Z_PARAM_LONG(key)
ZEND_PARSE_PARAMETERS_END();
resource = php_url_parse_ex(str, str_len);
resource = php_url_parse_ex2(str, str_len, &has_port);
if (resource == NULL) {
/* @todo Find a method to determine why php_url_parse_ex() failed */
RETURN_FALSE;
@ -346,7 +358,7 @@ PHP_FUNCTION(parse_url)
if (resource->host != NULL) RETVAL_STR_COPY(resource->host);
break;
case PHP_URL_PORT:
if (resource->port != 0) RETVAL_LONG(resource->port);
if (has_port) RETVAL_LONG(resource->port);
break;
case PHP_URL_USER:
if (resource->user != NULL) RETVAL_STR_COPY(resource->user);
@ -382,7 +394,7 @@ PHP_FUNCTION(parse_url)
ZVAL_STR_COPY(&tmp, resource->host);
zend_hash_add_new(Z_ARRVAL_P(return_value), ZSTR_KNOWN(ZEND_STR_HOST), &tmp);
}
if (resource->port != 0) {
if (has_port) {
ZVAL_LONG(&tmp, resource->port);
zend_hash_add_new(Z_ARRVAL_P(return_value), ZSTR_KNOWN(ZEND_STR_PORT), &tmp);
}

1
ext/standard/url.h
View File

@ -31,6 +31,7 @@ typedef struct php_url {
PHPAPI void php_url_free(php_url *theurl);
PHPAPI php_url *php_url_parse(char const *str);
PHPAPI php_url *php_url_parse_ex(char const *str, size_t length);
PHPAPI php_url *php_url_parse_ex2(char const *str, size_t length, zend_bool *has_port);
PHPAPI size_t php_url_decode(char *str, size_t len); /* return value: length of decoded string */
PHPAPI size_t php_raw_url_decode(char *str, size_t len); /* return value: length of decoded string */
PHPAPI zend_string *php_url_encode(char const *s, size_t len);