Changeset 72455 in vbox for trunk

Timestamp:

Jun 6, 2018 12:23:08 AM (7 years ago)

Author:

vboxsync

Message:

Storage/CUE: Handle end of stream before the closing quotation mark properly

File:

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

trunk/src/VBox/Storage/CUE.cpp

@@ -566 +566 @@
     pToken->Type.String.psz = pTokenizer->pszInput;
 
-    while (cueTokenizerGetCh(pTokenizer) != '\"')
+    while (   !cueTokenizerIsEos(pTokenizer)
+           && cueTokenizerGetCh(pTokenizer) != '\"')
     {
         cchStr++;
@@ -572 +573 @@
     }
 
-    cueTokenizerSkipCh(pTokenizer); /* Skip closing " */
-
-    pToken->Type.String.cch = cchStr;
+    /* End of stream without a closing quote is an error. */
+    if (RT_UNLIKELY(cueTokenizerIsEos(pTokenizer)))
+        pToken->enmType = CUETOKENTYPE_ERROR;
+    else
+    {
+        cueTokenizerSkipCh(pTokenizer); /* Skip closing " */
+        pToken->Type.String.cch = cchStr;
+    }
 }