| Index: lib/Bitcode/NaCl/Reader/NaClBitstreamReader.cpp
|
| diff --git a/lib/Bitcode/NaCl/Reader/NaClBitstreamReader.cpp b/lib/Bitcode/NaCl/Reader/NaClBitstreamReader.cpp
|
| index 677539071b7c066b9b7ab48ba1df2bf5bb487f9b..d75c42ca9bf282ab9f3f4505821d2d88e18166bf 100644
|
| --- a/lib/Bitcode/NaCl/Reader/NaClBitstreamReader.cpp
|
| +++ b/lib/Bitcode/NaCl/Reader/NaClBitstreamReader.cpp
|
| @@ -71,13 +71,14 @@ bool NaClBitstreamCursor::EnterSubBlock(unsigned BlockID, unsigned *NumWordsP) {
|
| }
|
|
|
| // Get the codesize of this block.
|
| - CurCodeSize = ReadVBR(naclbitc::CodeLenWidth);
|
| + CurCodeSize.IsFixed = true;
|
| + CurCodeSize.NumBits = ReadVBR(naclbitc::CodeLenWidth);
|
| SkipToFourByteBoundary();
|
| unsigned NumWords = Read(naclbitc::BlockSizeWidth);
|
| if (NumWordsP) *NumWordsP = NumWords;
|
|
|
| // Validate that this block is sane.
|
| - if (CurCodeSize == 0 || AtEndOfStream())
|
| + if (CurCodeSize.NumBits == 0 || AtEndOfStream())
|
| return true;
|
|
|
| return false;
|
|
|