Fixed bug #45581 (htmlspecialchars() double encoding &#x hex items)

diff --git a/ext/standard/html.c b/ext/standard/html.c
index 62c464609086410cc03f5fc28e921c7c40ae4dc2..abc8347499d3b94f6b63de08e88875fc6b2fb9cf 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -1197,9 +1197,20 @@ encode_amp:
                                        } else {
                                                if (*s == '#') { /* numeric entities */
                                                        s++;
-                                                       while (s < e) {
-                                                               if (!isdigit(*s++)) {
-                                                                       goto encode_amp;
+                                                       /* Hex (&#x5A;) */
+                                                       if (*s == 'x' || *s == 'X') {
+                                                               s++;
+                                                               while (s < e) {
+                                                                       if (!isxdigit(*s++)) {
+                                                                               goto encode_amp;
+                                                                       }
+                                                               }
+                                                       /* Dec (&#90;)*/
+                                                       } else {
+                                                               while (s < e) {
+                                                                       if (!isdigit(*s++)) {
+                                                                               goto encode_amp;
+                                                                       }
                                                                }
                                                        }
                                                } else { /* text entities */

diff --git a/ext/standard/tests/strings/htmlentities18.phpt b/ext/standard/tests/strings/htmlentities18.phpt
index 381cc838ed700b1ed7bcdae2fc0503c2a30fd510..d0492a8704cd0fada3e09fde6b441d959bc9e65e 100644 (file)
--- a/ext/standard/tests/strings/htmlentities18.phpt
+++ b/ext/standard/tests/strings/htmlentities18.phpt
@@ -6,7 +6,8 @@ $tests = array(
        "abc",
        "abc&sfdsa",
        "test+s & some more D",
-       "&; &amp &#a; &9;",
+       "test+s & some more D",
+       "&; &amp &#a; &9; &#xyz;",
        "&kffjadfdhsjfhjasdhffasdfas;",
        "&#8787978789",
        "&",
@@ -26,8 +27,10 @@ unicode(13) "abc&sfdsa"
 unicode(13) "abc&sfdsa"
 unicode(33) "test+s & some more D"
 unicode(33) "test+s & some more D"
-unicode(24) "&; &amp &#a; &9;"
-unicode(24) "&; &amp &#a; &9;"
+unicode(34) "test+s & some more D"
+unicode(34) "test+s & some more D"
+unicode(35) "&; &amp &#a; &9; &#xyz;"
+unicode(35) "&; &amp &#a; &9; &#xyz;"
 unicode(32) "&kffjadfdhsjfhjasdhffasdfas;"
 unicode(32) "&kffjadfdhsjfhjasdhffasdfas;"
 unicode(16) "&#8787978789"