Fix issue 20366 - programming bug in ctfe foreach_rverse code

Index is not decremented which causes bounds checking error.
dlang · Nov 7, 2019 · 5ed5704 · 5ed5704
1 parent 37a0434
commit 5ed5704
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/dmd/dinterpret.d b/src/dmd/dinterpret.d
@@ -7218,6 +7218,7 @@ private Expression foreachApplyUtf(UnionExp* pue, InterState* istate, Expression
                         char x = cast(char)r.isIntegerExp().getInteger();
                         if ((x & 0xC0) != 0x80)
                             break;
+                        --indx;
                         ++buflen;
                     }
                 }

diff --git a/test/runnable/interpret.d b/test/runnable/interpret.d
@@ -3505,6 +3505,20 @@ void test15681()
 
 /************************************************/
 
+auto test20366()
+{
+    const(char)[] s = ['h', 'e', 'l', '\xef', '\xbd', '\x8c', 'o'];
+
+    foreach_reverse (dchar c; s)
+    {
+    }
+
+    return true;
+}
+static assert(test20366());
+
+/************************************************/
+
 int main()
 {
     test1();
@@ -3628,6 +3642,7 @@ int main()
     test14140();
     test14862();
     test15681();
+    test20366();
 
     printf("Success\n");
     return 0;