Bug #54063: Use rawurldecode() and check invalid UTF-8

postcode-nl · Oct 14, 2021 · ee72d51 · ee72d51
1 parent b7a87ac
commit ee72d51
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/PostcodeNl/AddressAutocomplete/Proxy.php b/src/PostcodeNl/AddressAutocomplete/Proxy.php
@@ -41,7 +41,7 @@ public function autocomplete(): void
 	{
 		$this->_populateSession();
 		[$context, $term] = $this->_getParameters(2);
-		$term = urldecode($term);
+		$term = wp_check_invalid_utf8(rawurldecode($term));
 
 		try
 		{
@@ -73,7 +73,7 @@ public function getDetails(): void
 	public function dutchAddressLookup(): void
 	{
 		[$postcode, $houseNumberAndAddition] = $this->_getParameters(2);
-		$houseNumberAndAddition = urldecode($houseNumberAndAddition);
+		$houseNumberAndAddition = wp_check_invalid_utf8(rawurldecode($houseNumberAndAddition));
 
 		preg_match('/^(?<houseNumber>\d{1,5})(?<addition>\D.*)?$/', $houseNumberAndAddition, $matches);
 		$houseNumber = isset($matches['houseNumber']) ? (int)$matches['houseNumber'] : null;