Merge pull request #129 from prozolic/pullreq

Fix ConsumeBom
hadashiA · Oct 31, 2024 · 6020892 · 6020892
2 parents f8bbc04 + a4786ce
commit 6020892
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Parser/Utf8YamlTokenizer.cs b/VYaml.Unity/Assets/VYaml/Runtime/Parser/Utf8YamlTokenizer.cs
@@ -300,7 +300,7 @@ void ConsumeStreamEnd()
             tokens.Enqueue(new Token(TokenType.StreamEnd));
         }
 
-        void ConsumeBom()
+        bool ConsumeBom()
         {
             if (reader.IsNext(YamlCodes.Utf8Bom))
             {
@@ -324,7 +324,11 @@ void ConsumeBom()
                         throw new YamlTokenizerException(CurrentMark, "BOM must be at the beginning of the stream or document.");
                     }
                 }
+                return true;
             }
+
+            // not BOM.
+            return false;
         }
 
         void ConsumeDirective()
@@ -1482,7 +1486,7 @@ void SkipToNextToken()
                         }
                         break;
                     case 0xEF:
-                        ConsumeBom();
+                        if (!ConsumeBom()) return;
                         break;
                     default:
                         return;

diff --git a/VYaml/Parser/Utf8YamlTokenizer.cs b/VYaml/Parser/Utf8YamlTokenizer.cs
@@ -300,7 +300,7 @@ void ConsumeStreamEnd()
             tokens.Enqueue(new Token(TokenType.StreamEnd));
         }
 
-        void ConsumeBom()
+        bool ConsumeBom()
         {
             if (reader.IsNext(YamlCodes.Utf8Bom))
             {
@@ -324,7 +324,11 @@ void ConsumeBom()
                         throw new YamlTokenizerException(CurrentMark, "BOM must be at the beginning of the stream or document.");
                     }
                 }
+                return true;
             }
+
+            // not BOM.
+            return false;
         }
 
         void ConsumeDirective()
@@ -1482,7 +1486,7 @@ void SkipToNextToken()
                         }
                         break;
                     case 0xEF:
-                        ConsumeBom();
+                        if (!ConsumeBom()) return;
                         break;
                     default:
                         return;