Review fixes

Author: kocsismate

ext/filter/logical_filters.c

@@ -16,9 +16,9 @@
   +----------------------------------------------------------------------+
 */
 
+#include "zend_exceptions.h"
 #include "php_filter.h"
 #include "filter_private.h"
-#include "ext/standard/url.h"
 #include "ext/pcre/php_pcre.h"
 #include "ext/uri/php_uri.h"
 
@@ -610,7 +610,7 @@ void php_filter_validate_url(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 
 	uri_handler_t *uri_handler = php_uri_get_handler(parser_name_set ? parser_name : NULL);
 	if (uri_handler == NULL) {
-		zend_throw_error(NULL, "Invalid URI parser used");
+		zend_value_error("%s(): \"uri_parser_class\" option has invalid value", get_active_function_name());
 		RETURN_VALIDATION_FAILED
 	}
 

ext/openssl/xp_ssl.c

@@ -26,6 +26,7 @@
 #include "ext/uri/php_uri.h"
 #include "streams/php_streams_int.h"
 #include "zend_smart_str.h"
+#include "zend_exceptions.h"
 #include "php_openssl.h"
 #include "php_network.h"
 #include <openssl/ssl.h>
@@ -2628,6 +2629,7 @@ static char *php_openssl_get_url_name(const char *resourcename,
 
 	uri_handler_t *uri_handler = php_stream_context_get_uri_handler("ssl", context);
 	if (uri_handler == NULL) {
+		zend_value_error("%s(): Provided stream context has invalid value for the \"uri_parser_class\" option", get_active_function_name());
 		return NULL;
 	}
 

ext/standard/ftp_fopen_wrapper.c

@@ -21,6 +21,7 @@
 #include "php_globals.h"
 #include "php_network.h"
 #include "php_ini.h"
+#include "zend_exceptions.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -136,6 +137,7 @@ static php_stream *php_ftp_fopen_connect(php_stream_wrapper *wrapper, const char
 
 	uri_handler_t *uri_handler = php_stream_context_get_uri_handler("ftp", context);
 	if (uri_handler == NULL) {
+		zend_value_error("%s(): Provided stream context has invalid value for the \"uri_parser_class\" option", get_active_function_name());
 		return NULL;
 	}
 
@@ -956,6 +958,7 @@ static int php_stream_ftp_rename(php_stream_wrapper *wrapper, const char *url_fr
 
 	uri_handler_t *uri_handler = php_stream_context_get_uri_handler("ftp", context);
 	if (uri_handler == NULL) {
+		zend_value_error("%s(): Provided stream context has invalid value for the \"uri_parser_class\" option", get_active_function_name());
 		return 0;
 	}
 
@@ -1022,6 +1025,7 @@ static int php_stream_ftp_rename(php_stream_wrapper *wrapper, const char *url_fr
 	return 1;
 
 rename_errexit:
+	php_uri_struct_free(resource_from);
 	if (resource_to) {
 		php_uri_struct_free(resource_to);
 	}

ext/standard/http_fopen_wrapper.c

@@ -26,6 +26,7 @@
 #include "php_ini.h"
 #include "ext/standard/basic_functions.h"
 #include "zend_smart_str.h"
+#include "zend_exceptions.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -394,6 +395,7 @@ static php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper,
 
 	uri_handler_t *uri_handler = php_stream_context_get_uri_handler("http", context);
 	if (uri_handler == NULL) {
+		zend_value_error("%s(): Provided stream context has invalid value for the \"uri_parser_class\" option", get_active_function_name());
 		return NULL;
 	}
 	resource = php_uri_parse_to_struct(uri_handler, path, strlen(path), URI_COMPONENT_READ_RAW, true);

ext/standard/tests/file/file_get_contents_with_custom_uri_parser.phpt

@@ -3,6 +3,17 @@ Test file_get_contents() function when a custom URI parser is configured
 --FILE--
 <?php
 
+try {
+    $context = stream_context_create([
+        "http" => [
+            "uri_parser_class" => "not-exists",
+        ],
+    ]);
+    var_dump(file_get_contents("https://example.com", context: $context));
+} catch (Error $e) {
+    echo $e->getMessage() . "\n";
+}
+
 $context = stream_context_create([
     "http" => [
         "uri_parser_class" => null,
@@ -26,6 +37,8 @@ var_dump(file_get_contents("https://exa%23mple.org", context: $context)); // inv
 
 ?>
 --EXPECTF--
+file_get_contents(): Provided stream context has invalid value for the "uri_parser_class" option
+
 Warning: file_get_contents(https:///example.com): Failed to open stream: operation failed in %s on line %d
 bool(false)
 

main/streams/streams.c

@@ -2468,7 +2468,7 @@ PHPAPI struct uri_handler_t *php_stream_context_get_uri_handler(const char *wrap
 	}
 
 	zval *uri_handler_name = php_stream_context_get_option(context, wrappername, "uri_parser_class");
-	if (uri_handler_name == NULL) {
+	if (uri_handler_name == NULL || Z_TYPE_P(uri_handler_name) == IS_NULL) {
 		return php_uri_get_handler(NULL);
 	}