ICU4J: Fix bug with '||' in a reserved statement being misparsed

unicode-org · Aug 7, 2024 · 22ce1cd · 22ce1cd
1 parent 3ac4b37
commit 22ce1cd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFParser.java b/icu4j/main/core/src/main/java/com/ibm/icu/message2/MFParser.java
@@ -369,8 +369,10 @@ private String getReservedBody() throws MFParseException {
         result.append(firstPart);
         while (true) {
             int spaceCount = skipWhitespaces();
+            int beforeNextPart = input.getPosition();
             String nextPart = getReservedBodyPart();
-            if (nextPart.length() == 0) {
+            // If we didn't parse anything, restore the whitespace
+            if (input.getPosition() <= beforeNextPart) {
                 input.backup(spaceCount);
                 break;
             }

diff --git a/testdata/message2/reserved-syntax-2.json b/testdata/message2/reserved-syntax-2.json
@@ -8,7 +8,8 @@
       { "src" : "\\\\{   ?   󗟋   𫓜|@}   |}", "ignoreCpp": "This would be an error in ICU4C" },
       { "src" : "\\\\{   ?   󗟋   𫓜|@}   |   \\}   @𠟅򑚎𥪙𽧫=||   @򒘒򳷦㥞򉊷=$򸚶񽱆񅗽񤕞   @𰺱:񎫛񢶛򶈎񄮒}", "ignoreCpp": "This would be an error in ICU4C" },
       { "src" : "{  $iFN  ^  @USh  =$u  @l}", "ignoreCpp": "This would be an error in ICU4C" },
-      { "src" : ".local $dS ={ $p4 ^ |.| \\\\ @g:FV = $kd}{{@}}", "ignoreCpp": "This would be an error in ICU4C" }
+      { "src" : ".local $dS ={ $p4 ^ |.| \\\\ @g:FV = $kd}{{@}}", "ignoreCpp": "This would be an error in ICU4C" },
+      { "src" : ".D. \\\\ ||{1}{{}} ", "ignoreCpp": "This would be an error in ICU4C" }
   ]
 }