uri: Improve exceptions for Uri\Rfc3986\Uri

ext/uri/php_uriparser.c

@@ -21,7 +21,6 @@
 #include "Zend/zend_exceptions.h"
 
 static void uriparser_free_uri(void *uri);
-static void throw_invalid_uri_exception(void);
 
 static void *uriparser_malloc(UriMemoryManager *memory_manager, size_t size)
 {
@@ -293,51 +292,68 @@ static uriparser_uris_t *uriparser_create_uris(void)
 	return uriparser_uris;
 }
 
-static void throw_invalid_uri_exception(void)
+void *uriparser_parse_uri_ex(const zend_string *uri_str, const uriparser_uris_t *uriparser_base_urls, bool silent)
 {
-	zend_throw_exception(uri_invalid_uri_exception_ce, "The specified URI is malformed", 0);
-}
+	UriUriA uri = {0};
 
-#define PARSE_URI(dest_uri, uri_str, uriparser_uris, silent) \
-	do { \
-		if (ZSTR_LEN(uri_str) == 0 || \
-			uriParseSingleUriExMmA(dest_uri, ZSTR_VAL(uri_str), ZSTR_VAL(uri_str) + ZSTR_LEN(uri_str), NULL, mm) != URI_SUCCESS \
-		) { \
-			efree(uriparser_uris); \
-			if (!silent) { \
-				throw_invalid_uri_exception(); \
-			} \
-			return NULL; \
-		} \
-	} while (0)
+	/* Empty URIs are always invalid. */
+	if (ZSTR_LEN(uri_str) == 0) {
+		if (!silent) {
+			zend_throw_exception(uri_invalid_uri_exception_ce, "The specified URI must not be empty", 0);
+		}
 
-void *uriparser_parse_uri_ex(const zend_string *uri_str, const uriparser_uris_t *uriparser_base_urls, bool silent)
-{
-	uriparser_uris_t *uriparser_uris = uriparser_create_uris();
+		goto fail;
+	}
+
+	/* Parse the URI. */
+	if (uriParseSingleUriExMmA(&uri, ZSTR_VAL(uri_str), ZSTR_VAL(uri_str) + ZSTR_LEN(uri_str), NULL, mm) != URI_SUCCESS) {
+		if (!silent) {
+			zend_throw_exception(uri_invalid_uri_exception_ce, "The specified URI is malformed", 0);
+		}
 
-	if (uriparser_base_urls == NULL) {
-		PARSE_URI(&uriparser_uris->uri, uri_str, uriparser_uris, silent);
-		uriMakeOwnerMmA(&uriparser_uris->uri, mm);
-	} else {
-		UriUriA uri;
+		goto fail;
+	}
 
-		PARSE_URI(&uri, uri_str, uriparser_uris, silent);
+	if (uriparser_base_urls != NULL) {
+		UriUriA tmp = {0};
 
-		if (uriAddBaseUriExMmA(&uriparser_uris->uri, &uri, &uriparser_base_urls->uri, URI_RESOLVE_STRICTLY, mm) != URI_SUCCESS) {
-			efree(uriparser_uris);
-			uriFreeUriMembersMmA(&uri, mm);
+		/* Combine the parsed URI with the base URI and store the result in 'tmp',
+		 * since the target and source URLs must be distinct. */
+		int result = uriAddBaseUriExMmA(&tmp, &uri, &uriparser_base_urls->uri, URI_RESOLVE_STRICTLY, mm);
+		if (result != URI_SUCCESS) {
 			if (!silent) {
-				throw_invalid_uri_exception();
+				switch (result) {
+					case URI_ERROR_ADDBASE_REL_BASE:
+						zend_throw_exception(uri_invalid_uri_exception_ce, "The specified base URI must be absolute", 0);
+						break;
+					default:
+						/* This should be unreachable in practice. */
+						zend_throw_exception(uri_invalid_uri_exception_ce, "Failed to resolve the specified URI against the base URI", 0);
+						break;
+				}
 			}
 
-			return NULL;
+			goto fail;
 		}
 
-		uriMakeOwnerMmA(&uriparser_uris->uri, mm);
+		/* Store the combined URI back into 'uri'. */
 		uriFreeUriMembersMmA(&uri, mm);
+		uri = tmp;
 	}
 
+	/* Make the resulting URI independent of the 'uri_str'. */
+	uriMakeOwnerMmA(&uri, mm);
+
+	uriparser_uris_t *uriparser_uris = uriparser_create_uris();
+	uriparser_uris->uri = uri;
+
 	return uriparser_uris;
+
+ fail:
+
+	uriFreeUriMembersMmA(&uri, mm);
+
+	return NULL;
 }
 
 void *uriparser_parse_uri(const zend_string *uri_str, const void *base_url, zval *errors, bool silent)

ext/uri/tests/004.phpt

@@ -29,7 +29,7 @@ var_dump(Uri\WhatWg\Url::parse("http://RuPaul's Drag Race All Stars 7 Winners Ca
 
 ?>
 --EXPECTF--
-The specified URI is malformed
+The specified URI must not be empty
 NULL
 The specified URI is malformed (MissingSchemeNonRelativeUrl)
 NULL

ext/uri/tests/055.phpt

@@ -12,4 +12,4 @@ try {
 }
 ?>
 --EXPECT--
-The specified URI is malformed
+The specified base URI must be absolute