Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(790)

Unified Diff: lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp

Issue 932953002: Fix the NaCl bitstream reader to report fatal errors. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-llvm.git@master
Patch Set: Merge with master Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/Bitcode/NaCl/Reader/NaClBitcodeParser.cpp ('k') | lib/Bitcode/NaCl/Reader/NaClBitstreamReader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
diff --git a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
index d356985c8e51ed97cf536a086969d964243dd464..c1fb4a84aa1e43f69db9317cd7a38470143cc4c1 100644
--- a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
+++ b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp
@@ -1846,10 +1846,12 @@ std::error_code NaClBitcodeReader::InitStreamFromBuffer() {
return Error(InvalidBitstream,
"Bitcode stream should be a multiple of 4 bytes in length");
- if (Header.Read(BufPtr, BufEnd))
+ const unsigned char *HeaderPtr = BufPtr;
+ if (Header.Read(HeaderPtr, BufEnd))
return Error(InvalidBitstream, Header.Unsupported());
- StreamFile.reset(new NaClBitstreamReader(BufPtr, BufEnd));
+ StreamFile.reset(new NaClBitstreamReader(BufPtr, BufEnd,
+ Header.getHeaderSize()));
Stream.init(StreamFile.get());
if (AcceptHeader())
« no previous file with comments | « lib/Bitcode/NaCl/Reader/NaClBitcodeParser.cpp ('k') | lib/Bitcode/NaCl/Reader/NaClBitstreamReader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698