Merge pull request dotnet#33310 from jasonmalinowski/fix-virtualchar-…

…crash Ensure we don't run off the end of the string when parsing \x1
ryzngard · Feb 13, 2019 · a516280 · a516280
2 parents 25f0c8f + c5edbf0
commit a516280
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/Workspaces/CSharp/Portable/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs b/src/Workspaces/CSharp/Portable/EmbeddedLanguages/VirtualChars/CSharpVirtualCharService.cs
@@ -261,7 +261,6 @@ private bool TryAddMultiCharacterEscape(
                     return false;
                 }
 
-                var endIndex = index + 1;
                 for (var i = 0; i < 4; i++)
                 {
                     var ch2 = tokenText[index + i];
@@ -272,7 +271,6 @@ private bool TryAddMultiCharacterEscape(
                     }
 
                     intChar = (intChar << 4) + HexValue(ch2);
-                    endIndex++;
                 }
 
                 character = (char)intChar;
@@ -292,7 +290,7 @@ private bool TryAddMultiCharacterEscape(
                 }
 
                 var endIndex = index;
-                for (var i = 0; i < 4; i++)
+                for (var i = 0; i < 4 && endIndex < tokenText.Length; i++)
                 {
                     var ch2 = tokenText[index + i];
                     if (!IsHexDigit(ch2))

diff --git a/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs b/src/Workspaces/CSharpTest/EmbeddedLanguages/VirtualChars/CSharpVirtualCharServiceTests.cs
@@ -94,15 +94,10 @@ public void TestBracesInInterpolatedVerbatimSimpleString()
             Test("$@\"{{\"", "['{',[3,5]]");
         }
 
-        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/29172")]
-        public void TestReverseInterpolatedVerbatimString()
+        [Fact]
+        public void TestBracesInReverseInterpolatedVerbatimSimpleString()
         {
-            // This will need to be fixed once @$ strings come online.
-            // This is tracked with https://github.com/dotnet/roslyn/issues/29172
-            var token = GetStringToken("@$\"{{\"", allowFailure: true);
-            Assert.True(token == default);
-
-            TestFailure("@$\"{{\"");
+            Test("@$\"{{\"", "['{',[3,5]]");
         }
 
         [Fact]
@@ -165,6 +160,12 @@ public void TestValidHex1Escape()
             Test(@"""\xa""", @"['\u000A',[1,4]]");
         }
 
+        [Fact]
+        public void TestValidHex1EscapeInInterpolatedString()
+        {
+            Test(@"$""\xa""", @"['\u000A',[2,5]]");
+        }
+
         [Fact]
         public void TestValidHex2Escape()
         {