- Fixed bug #61374: html_entity_decode tries to decode code points that don't

  exist in ISO-8859-1.

Author: cataphract

ext/standard/html.c

@@ -1004,8 +1004,9 @@ static void traverse_for_entities(
 				/* && code2 == '\0' always true for current maps */)
 			goto invalid_code;
 
-		/* deal with encodings other than utf-8/iso-8859-1 */
-		if (!CHARSET_UNICODE_COMPAT(charset)) {
+		/* UTF-8 doesn't need mapping (ISO-8859-1 doesn't either, but
+		 * the call is needed to ensure the codepoint <= U+00FF)  */
+		if (charset != cs_utf_8) {
 			/* replace unicode code point */
 			if (map_from_unicode(code, charset, &code) == FAILURE || code2 != 0)
 				goto invalid_code; /* not representable in target charset */

ext/standard/tests/strings/bug61374.phpt

@@ -0,0 +1,7 @@
+--TEST--
+Bug #61374: html_entity_decode tries to decode code points that don't exist in ISO-8859-1
+--FILE--
+<?php
+echo html_entity_decode('&OElig;', 0, 'ISO-8859-1');
+--EXPECT--
+&OElig;