maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[BitcodeReader] Don't allow INSERTVAL/EXTRACTVAL with 0 indices 

This would trigger an assertion later.

Bug found with AFL fuzz.

llvm-svn: 237494
This commit is contained in:
Filipe Cabecinhas 2015-05-16 00:33:12 +00:00
parent 341eda4ca7
commit 1c299d05e6
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -3555,10 +3555,13 @@ std::error_code BitcodeReader::ParseFunctionBody(Function *F) {
if (getValueTypePair(Record, OpNum, NextValueNo, Agg))
return Error("Invalid record");
unsigned RecSize = Record.size();
if (OpNum == RecSize)
return Error("EXTRACTVAL: Invalid instruction with 0 indices");
SmallVector<unsigned, 4> EXTRACTVALIdx;
Type *CurTy = Agg->getType();
for (unsigned RecSize = Record.size();
OpNum != RecSize; ++OpNum) {
for (; OpNum != RecSize; ++OpNum) {
bool IsArray = CurTy->isArrayTy();
bool IsStruct = CurTy->isStructTy();
uint64_t Index = Record[OpNum];
@ -3594,10 +3597,13 @@ std::error_code BitcodeReader::ParseFunctionBody(Function *F) {
if (getValueTypePair(Record, OpNum, NextValueNo, Val))
return Error("Invalid record");
unsigned RecSize = Record.size();
if (OpNum == RecSize)
return Error("INSERTVAL: Invalid instruction with 0 indices");
SmallVector<unsigned, 4> INSERTVALIdx;
Type *CurTy = Agg->getType();
for (unsigned RecSize = Record.size();
OpNum != RecSize; ++OpNum) {
for (; OpNum != RecSize; ++OpNum) {
bool IsArray = CurTy->isArrayTy();
bool IsStruct = CurTy->isStructTy();
uint64_t Index = Record[OpNum];

BIN
llvm/test/Bitcode/Inputs/invalid-extract-0-indices.bc Normal file
View File

Binary file not shown.

BIN
llvm/test/Bitcode/Inputs/invalid-insert-0-indices.bc Normal file
View File

Binary file not shown.

10
llvm/test/Bitcode/invalid.test
View File

@ -127,3 +127,13 @@ RUN: not llvm-dis -disable-output %p/Inputs/invalid-GCTable-overflow.bc 2>&1 | \
RUN: FileCheck --check-prefix=GCTABLE-OFLOW %s
GCTABLE-OFLOW: Invalid ID
RUN: not llvm-dis -disable-output %p/Inputs/invalid-insert-0-indices.bc 2>&1 | \
RUN: FileCheck --check-prefix=INSERT-0-IDXS %s
INSERT-0-IDXS: INSERTVAL: Invalid instruction with 0 indices
RUN: not llvm-dis -disable-output %p/Inputs/invalid-extract-0-indices.bc 2>&1 | \
RUN: FileCheck --check-prefix=EXTRACT-0-IDXS %s
EXTRACT-0-IDXS: EXTRACTVAL: Invalid instruction with 0 indices