[llvm-commits] [llvm] r164701 - /llvm/trunk/lib/Support/YAMLParser.cpp

[Benjamin Kramer]

Author: d0k
Date: Wed Sep 26 10:52:15 2012
New Revision: 164701

URL: http://llvm.org/viewvc/llvm-project?rev=164701&view=rev
Log:
YAMLParser: Fix invalid reads when encountering incorrectly quoted scalar.

Fixes PR12632.

Modified:
    llvm/trunk/lib/Support/YAMLParser.cpp

Modified: llvm/trunk/lib/Support/YAMLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/YAMLParser.cpp?rev=164701&r1=164700&r2=164701&view=diff
==============================================================================
--- llvm/trunk/lib/Support/YAMLParser.cpp (original)
+++ llvm/trunk/lib/Support/YAMLParser.cpp Wed Sep 26 10:52:15 2012
@@ -903,6 +903,7 @@
 void Scanner::skip(uint32_t Distance) {
   Current += Distance;
   Column += Distance;
+  assert(Current <= End && "Skipped past the end");
 }
 
 bool Scanner::isBlankOrBreak(StringRef::iterator Position) {
@@ -1239,6 +1240,12 @@
       }
     }
   }
+
+  if (Current == End) {
+    setError("Expected quote at end of scalar", Current);
+    return false;
+  }
+
   skip(1); // Skip ending quote.
   Token T;
   T.Kind = Token::TK_Scalar;