Merge pull request #140 from VATSIM-UK/319-region-parser-points-check

fix(regionparser): handle invalid number of region points
VATSIM-UK · Apr 4, 2021 · 88ed002 · 88ed002
2 parents 7292454 + a724642
commit 88ed002
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/src/Compiler/Parser/RegionParser.cs b/src/Compiler/Parser/RegionParser.cs
@@ -53,6 +53,7 @@ public void ParseData(AbstractSectorDataFile data)
 
                 // Expecting a colour definition for the region
                 if (expectingColourDefinition) {
+                    // On lines where we're expecting a colour, we want to see a colour followed by point/latlong
                     if (line.dataSegments.Count != 3)
                     {
                         this.eventLogger.AddEvent(
@@ -125,6 +126,15 @@ public void ParseData(AbstractSectorDataFile data)
                     expectingColourDefinition = true;
                     continue;
                 }
+
+                // On lines without colours, we expect to see a point/latlong only
+                if (line.dataSegments.Count != 2)
+                {
+                    this.eventLogger.AddEvent(
+                        new SyntaxError("Invalid number of points in REGION" + data.CurrentLine, line)
+                    );
+                    return;
+                }
 
                 Point parsedPoint = PointParser.Parse(line.dataSegments[0], line.dataSegments[1]);
                 if (Equals(parsedPoint, PointParser.InvalidPoint))

diff --git a/tests/CompilerTest/Parser/RegionParserTest.cs b/tests/CompilerTest/Parser/RegionParserTest.cs
@@ -156,6 +156,24 @@ public void TestItAddsMultipleRegionsData()
                     "White JSY JSY"
                 }
             }, // Incomplete mid-file
+            new object[]
+            {
+                new List<string>
+                {
+                    "REGIONNAME TestRegion",
+                    "Red BCN BCN ;comment",
+                    "A"
+                }
+            },  // Not enough points data
+            new object[]
+            {
+                new List<string>
+                {
+                    "REGIONNAME TestRegion",
+                    "Red BCN BCN ;comment",
+                    "A B C"
+                }
+            }  // Too much points data
         };
 
         [Theory]