ticket-78385 an empty string in parse_url() return when question mark is the last

Author: fu22ybear

ext/standard/tests/url/bug78385.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Bug #78385 parse_url() does not include 'query' when question mark is the last char
+--FILE--
+<?php
+
+var_dump(parse_url('http://example.com/foo?'));
+var_dump(parse_url('http://example.com/foo?', PHP_URL_QUERY));
+
+?>
+--EXPECT--
+array(4) {
+  ["scheme"]=>
+  string(4) "http"
+  ["host"]=>
+  string(11) "example.com"
+  ["path"]=>
+  string(4) "/foo"
+  ["query"]=>
+  string(0) ""
+}
+string(0) ""

ext/standard/tests/url/parse_url_basic_001.phpt

@@ -144,30 +144,36 @@ echo "Done";
   string(10) "/index.php"
 }
 
---> www.php.net/?: array(1) {
+--> www.php.net/?: array(2) {
   ["path"]=>
   string(12) "www.php.net/"
+  ["query"]=>
+  string(0) ""
 }
 
---> www.php.net:80/?: array(3) {
+--> www.php.net:80/?: array(4) {
   ["host"]=>
   string(11) "www.php.net"
   ["port"]=>
   int(80)
   ["path"]=>
   string(1) "/"
+  ["query"]=>
+  string(0) ""
 }
 
---> http://www.php.net/?: array(3) {
+--> http://www.php.net/?: array(4) {
   ["scheme"]=>
   string(4) "http"
   ["host"]=>
   string(11) "www.php.net"
   ["path"]=>
   string(1) "/"
+  ["query"]=>
+  string(0) ""
 }
 
---> http://www.php.net:80/?: array(4) {
+--> http://www.php.net:80/?: array(5) {
   ["scheme"]=>
   string(4) "http"
   ["host"]=>
@@ -176,6 +182,8 @@ echo "Done";
   int(80)
   ["path"]=>
   string(1) "/"
+  ["query"]=>
+  string(0) ""
 }
 
 --> http://www.php.net:80/index.php: array(4) {
@@ -290,7 +298,7 @@ echo "Done";
   string(10) "/index.php"
 }
 
---> http://www.php.net:80/index.php?: array(4) {
+--> http://www.php.net:80/index.php?: array(5) {
   ["scheme"]=>
   string(4) "http"
   ["host"]=>
@@ -299,6 +307,8 @@ echo "Done";
   int(80)
   ["path"]=>
   string(10) "/index.php"
+  ["query"]=>
+  string(0) ""
 }
 
 --> http://www.php.net:80/#foo: array(5) {
@@ -314,7 +324,7 @@ echo "Done";
   string(3) "foo"
 }
 
---> http://www.php.net:80/?#: array(4) {
+--> http://www.php.net:80/?#: array(5) {
   ["scheme"]=>
   string(4) "http"
   ["host"]=>
@@ -323,6 +333,8 @@ echo "Done";
   int(80)
   ["path"]=>
   string(1) "/"
+  ["query"]=>
+  string(0) ""
 }
 
 --> http://www.php.net:80/?test=1: array(5) {
@@ -731,11 +743,13 @@ echo "Done";
   string(4) "/:80"
 }
 
---> http://x:?: array(2) {
+--> http://x:?: array(3) {
   ["scheme"]=>
   string(4) "http"
   ["host"]=>
   string(1) "x"
+  ["query"]=>
+  string(0) ""
 }
 
 --> x:blah.com: array(2) {
@@ -754,11 +768,13 @@ echo "Done";
 
 --> x://::abc/?: bool(false)
 
---> http://::?: array(2) {
+--> http://::?: array(3) {
   ["scheme"]=>
   string(4) "http"
   ["host"]=>
   string(1) ":"
+  ["query"]=>
+  string(0) ""
 }
 
 --> http://::#: array(2) {

ext/standard/tests/url/parse_url_basic_008.phpt

@@ -38,10 +38,10 @@ echo "Done";
 --> http://www.php.net:80   : NULL
 --> http://www.php.net:80/   : NULL
 --> http://www.php.net/index.php   : NULL
---> www.php.net/?   : NULL
---> www.php.net:80/?   : NULL
---> http://www.php.net/?   : NULL
---> http://www.php.net:80/?   : NULL
+--> www.php.net/?   : string(0) ""
+--> www.php.net:80/?   : string(0) ""
+--> http://www.php.net/?   : string(0) ""
+--> http://www.php.net:80/?   : string(0) ""
 --> http://www.php.net:80/index.php   : NULL
 --> http://www.php.net:80/foo/bar/index.php   : NULL
 --> http://www.php.net:80/this/is/a/very/deep/directory/structure/and/file.php   : NULL
@@ -52,9 +52,9 @@ echo "Done";
 --> http://www.php.net:80/this/../a/../deep/directory/   : NULL
 --> http://www.php.net:80/this/is/a/very/deep/directory/../file.php   : NULL
 --> http://www.php.net:80/index.php   : NULL
---> http://www.php.net:80/index.php?   : NULL
+--> http://www.php.net:80/index.php?   : string(0) ""
 --> http://www.php.net:80/#foo   : NULL
---> http://www.php.net:80/?#   : NULL
+--> http://www.php.net:80/?#   : string(0) ""
 --> http://www.php.net:80/?test=1   : string(6) "test=1"
 --> http://www.php.net/?test=1&   : string(7) "test=1&"
 --> http://www.php.net:80/?&   : string(1) "&"
@@ -91,11 +91,11 @@ echo "Done";
 --> gg:9130731   : NULL
 --> http://user:@pass@host/path?argument?value#etc   : string(14) "argument?value"
 --> http://10.10.10.10/:80   : NULL
---> http://x:?   : NULL
+--> http://x:?   : string(0) ""
 --> x:blah.com   : NULL
 --> x:/blah.com   : NULL
 --> x://::abc/?   : bool(false)
---> http://::?   : NULL
+--> http://::?   : string(0) ""
 --> http://::#   : NULL
 --> x://::6.5   : NULL
 --> http://?:/   : bool(false)

ext/standard/url.c

@@ -307,6 +307,8 @@ PHPAPI php_url *php_url_parse_ex(char const *str, size_t length)
 		if (p < e) {
 			ret->query = zend_string_init(p, (e - p), 0);
 			php_replace_controlchars_ex(ZSTR_VAL(ret->query), ZSTR_LEN(ret->query));
+		} else {
+			ret->query = ZSTR_EMPTY_ALLOC();
 		}
 		e = p-1;
 	}