diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Bitcode/Reader/BitstreamReader.cpp | 3 | ||||
| -rw-r--r-- | llvm/test/Bitcode/Inputs/invalid-array-type.bc | bin | 0 -> 612 bytes | |||
| -rw-r--r-- | llvm/test/Bitcode/invalid.test | 5 |
3 files changed, 8 insertions, 0 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitstreamReader.cpp b/llvm/lib/Bitcode/Reader/BitstreamReader.cpp index ff37b8e4cfc..2f34532ae93 100644 --- a/llvm/lib/Bitcode/Reader/BitstreamReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitstreamReader.cpp @@ -201,6 +201,9 @@ unsigned BitstreamCursor::readRecord(unsigned AbbrevID, // Get the element encoding. assert(i+2 == e && "array op not second to last?"); const BitCodeAbbrevOp &EltEnc = Abbv->getOperandInfo(++i); + if (EltEnc.getEncoding() == BitCodeAbbrevOp::Array || + EltEnc.getEncoding() == BitCodeAbbrevOp::Blob) + report_fatal_error("Array element type can't be an Array or a Blob"); // Read all the elements. for (; NumElts; --NumElts) diff --git a/llvm/test/Bitcode/Inputs/invalid-array-type.bc b/llvm/test/Bitcode/Inputs/invalid-array-type.bc Binary files differnew file mode 100644 index 00000000000..3a4b635dd0e --- /dev/null +++ b/llvm/test/Bitcode/Inputs/invalid-array-type.bc diff --git a/llvm/test/Bitcode/invalid.test b/llvm/test/Bitcode/invalid.test index b6c2ed3e8d6..1d8e14230ff 100644 --- a/llvm/test/Bitcode/invalid.test +++ b/llvm/test/Bitcode/invalid.test @@ -73,3 +73,8 @@ RUN: not llvm-dis -disable-output %p/Inputs/invalid-abbrev-fixed-size-too-big.bc RUN: FileCheck --check-prefix=HUGE-ABBREV-OP %s HUGE-ABBREV-OP: Fixed or VBR abbrev record with size > MaxChunkData + +RUN: not llvm-dis -disable-output %p/Inputs/invalid-array-type.bc 2>&1 | \ +RUN: FileCheck --check-prefix=ARRAY-TYPE %s + +ARRAY-TYPE: Array element type can't be an Array or a Blob |
