fixes #21 (#24)

graphql-dotnet · Mar 20, 2019 · aa3d963 · aa3d963
1 parent de9ffa2
commit aa3d963
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/GraphQLParser.Tests/ParserTests.cs b/src/GraphQLParser.Tests/ParserTests.cs
@@ -2,6 +2,7 @@
 {
     using GraphQLParser;
     using GraphQLParser.AST;
+    using GraphQLParser.Exceptions;
     using System;
     using System.Linq;
     using Xunit;
@@ -10,6 +11,13 @@ public class ParserTests
     {
         private static readonly string NL = Environment.NewLine;
 
+        [Fact]
+        public void Parse_Unicode_Char_At_EOF_Should_Throw()
+        {
+            var parser = new Parser(new Lexer());
+            Assert.Throws<GraphQLSyntaxErrorException>(() => parser.Parse(new Source("{\"\\ue }")));
+        }
+
         [Fact]
         public void Parse_FieldInput_HasCorrectEndLocationAttribute()
         {

diff --git a/src/GraphQLParser/LexerContext.cs b/src/GraphQLParser/LexerContext.cs
@@ -315,8 +315,14 @@ private int GetPositionAfterWhitespace(string body, int start)
 
         private char GetUnicodeChar()
         {
-            var expression = this.source.Body.Substring(this.currentIndex, 5);
+            if (this.currentIndex + 5 > this.source.Body.Length)
+            {
+                var truncatedExpression = this.source.Body.Substring(this.currentIndex);
+                throw new GraphQLSyntaxErrorException($"Invalid character escape sequence at EOF: \\{truncatedExpression}.", this.source, this.currentIndex);
+            }
 
+            var expression = this.source.Body.Substring(this.currentIndex, 5);
+
             if (!this.OnlyHexInString(expression.Substring(1)))
             {
                 throw new GraphQLSyntaxErrorException($"Invalid character escape sequence: \\{expression}.", this.source, this.currentIndex);