lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp - Issue 932953002: Fix the NaCl bitstream reader to report fatal errors.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fix nits. 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

« include/llvm/Bitcode/NaCl/NaClBitstreamReader.h ('K') | « lib/Bitcode/NaCl/Reader/NaClBitcodeParser.cpp ('k') | lib/Bitcode/NaCl/Reader/NaClBitstreamReader.cpp » ('j') | unittests/Bitcode/NaClAbbrevErrorTests.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 c08c62d57be507704fb0ce438d2794ba8f43ff01..9af6e8da120164bd24babc7a7eb6e4d00cc83098 100644

--- a/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp

+++ b/lib/Bitcode/NaCl/Reader/NaClBitcodeReader.cpp

@@ -1851,10 +1851,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())