Changeset 72293 in vbox for trunk/src

Timestamp:

May 23, 2018 10:08:39 AM (7 years ago)

Author:

vboxsync

Message:

CUE: Fixed REM keyword parsing.

File:

• trunk/src/VBox/Storage/CUE.cpp (modified) (4 diffs)

trunk/src/VBox/Storage/CUE.cpp

@@ -312 +312 @@
 DECLINLINE(void) cueTokenizerSkipCh(PCUETOKENIZER pTokenizer)
 {
-    pTokenizer->pszInput++;
+    /* Never ever go past EOS. */
+    if (!cueTokenizerIsEos(pTokenizer))
+        pTokenizer->pszInput++;
 }
 
@@ -383 +385 @@
 
 /**
+ * Skip all whitespace starting from the current input buffer position.
+ * Skips all present comments too.
+ *
+ * @returns nothing.
+ * @param   pTokenizer    The tokenizer state.
+ */
+DECLINLINE(void) cueTokenizerSkipWhitespace(PCUETOKENIZER pTokenizer)
+{
+    while (!cueTokenizerIsEos(pTokenizer))
+    {
+        while (   cueTokenizerGetCh(pTokenizer) == ' '
+               || cueTokenizerGetCh(pTokenizer) == '\t')
+            cueTokenizerSkipCh(pTokenizer);
+
+        if (   !cueTokenizerIsEos(pTokenizer)
+            && !cueTokenizerIsSkipNewLine(pTokenizer))
+            break; /* Skipped everything, next is some real content. */
+    }
+}
+
+/**
  * Skips a multi line comment.
  *
@@ -393 +416 @@
            && !cueTokenizerIsSkipNewLine(pTokenizer))
         cueTokenizerSkipCh(pTokenizer);
-}
-
-/**
- * Skip all whitespace starting from the current input buffer position.
- * Skips all present comments too.
- *
- * @returns nothing.
- * @param   pTokenizer    The tokenizer state.
- */
-DECLINLINE(void) cueTokenizerSkipWhitespace(PCUETOKENIZER pTokenizer)
-{
-    while (!cueTokenizerIsEos(pTokenizer))
-    {
-        while (   cueTokenizerGetCh(pTokenizer) == ' '
-               || cueTokenizerGetCh(pTokenizer) == '\t')
-            cueTokenizerSkipCh(pTokenizer);
-
-        if (   !cueTokenizerIsEos(pTokenizer)
-            && !cueTokenizerIsSkipNewLine(pTokenizer))
-            break; /* Skipped everything, next is some real content. */
-    }
+    cueTokenizerSkipWhitespace(pTokenizer);
 }
 
@@ -428 +431 @@
     unsigned cchKeyword = 0;
     bool fIsKeyword = false;
-    bool fIsComment = false;
-    const char *pszKeyword = pTokenizer->pszInput;
-
-    Assert(RT_C_IS_ALPHA(*pszKeyword));
+    bool fIsComment;
+    const char *pszKeyword;
+
+    Assert(RT_C_IS_ALPHA(*pTokenizer->pszInput));
 
     do
     {
         fIsComment = false;
+        pszKeyword = pTokenizer->pszInput;
 
         do