diff options
| -rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 14 | ||||
| -rw-r--r-- | llvm/test/Bitcode/Inputs/invalid-extract-0-indices.bc | bin | 0 -> 452 bytes | |||
| -rw-r--r-- | llvm/test/Bitcode/Inputs/invalid-insert-0-indices.bc | bin | 0 -> 452 bytes | |||
| -rw-r--r-- | llvm/test/Bitcode/invalid.test | 10 |
4 files changed, 20 insertions, 4 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 743466051a1..e0800916c8c 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -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]; diff --git a/llvm/test/Bitcode/Inputs/invalid-extract-0-indices.bc b/llvm/test/Bitcode/Inputs/invalid-extract-0-indices.bc Binary files differnew file mode 100644 index 00000000000..bfde5264502 --- /dev/null +++ b/llvm/test/Bitcode/Inputs/invalid-extract-0-indices.bc diff --git a/llvm/test/Bitcode/Inputs/invalid-insert-0-indices.bc b/llvm/test/Bitcode/Inputs/invalid-insert-0-indices.bc Binary files differnew file mode 100644 index 00000000000..d7a91e1e448 --- /dev/null +++ b/llvm/test/Bitcode/Inputs/invalid-insert-0-indices.bc diff --git a/llvm/test/Bitcode/invalid.test b/llvm/test/Bitcode/invalid.test index 2fe77989b2a..fbd1cb9f4d9 100644 --- a/llvm/test/Bitcode/invalid.test +++ b/llvm/test/Bitcode/invalid.test @@ -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 |
