fix handling of && by htmlentities 'no-double-encode'

expand the test cases

diff --git a/ext/standard/html.c b/ext/standard/html.c
index a5f5292c3325c9802569e97e6787d4c96f6de138..5b102f3d82246f625fa1935d57d8e06746317723 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -1154,7 +1154,7 @@ encode_amp:
                                        len += sizeof("&") - 1;
                                } else {
                                        char *e = memchr(old + i, ';', oldlen - i);
-                                       char *s = old + i + 1;
+                                       char *s = old + i;
 
                                        if (!e || (e - s) > 10) { /* minor optimization to avoid "entities" over 10 chars in length */
                                                goto encode_amp;

diff --git a/ext/standard/tests/strings/htmlentities18.phpt b/ext/standard/tests/strings/htmlentities18.phpt
index f171adaca2bbc433f00a900e37ae7fb02a5d321f..ab3df05da87b80a246ef37674d797371b47d01bf 100644 (file)
--- a/ext/standard/tests/strings/htmlentities18.phpt
+++ b/ext/standard/tests/strings/htmlentities18.phpt
@@ -9,6 +9,9 @@ $tests = array(
        "&; &amp &#a; &9;",
        "&kffjadfdhsjfhjasdhffasdfas;",
        "&#8787978789",
+       "&",
+       "&&&",
+       "&ab&&",
 );
 
 foreach ($tests as $test) {
@@ -23,9 +26,15 @@ string(13) "abc&sfdsa"
 string(13) "abc&sfdsa"
 string(33) "test+s & some more D"
 string(33) "test+s & some more D"
-string(20) "&; &amp &#a; &9;"
-string(20) "&; &amp &#a; &9;"
+string(24) "&; &amp &#a; &9;"
+string(24) "&; &amp &#a; &9;"
 string(32) "&kffjadfdhsjfhjasdhffasdfas;"
 string(32) "&kffjadfdhsjfhjasdhffasdfas;"
 string(16) "&#8787978789"
 string(16) "&#8787978789"
+string(5) "&"
+string(5) "&"
+string(15) "&&&"
+string(15) "&&&"
+string(17) "&ab&&"
+string(17) "&ab&&"