[llvm] r238269 - [BitstreamReader] Make sure the Array operand type is an encoding

[Filipe Cabecinhas]

Author: filcab
Date: Tue May 26 19:48:43 2015
New Revision: 238269

URL: http://llvm.org/viewvc/llvm-project?rev=238269&view=rev
Log:
[BitstreamReader] Make sure the Array operand type is an encoding

Bug found with AFL fuzz.

Added:
    llvm/trunk/test/Bitcode/Inputs/invalid-array-operand-encoding.bc
Modified:
    llvm/trunk/lib/Bitcode/Reader/BitstreamReader.cpp
    llvm/trunk/test/Bitcode/invalid.test

Modified: llvm/trunk/lib/Bitcode/Reader/BitstreamReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitstreamReader.cpp?rev=238269&r1=238268&r2=238269&view=diff
==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitstreamReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitstreamReader.cpp Tue May 26 19:48:43 2015
@@ -203,6 +203,9 @@ unsigned BitstreamCursor::readRecord(uns
       if (i + 2 != e)
         report_fatal_error("Array op not second to last");
       const BitCodeAbbrevOp &EltEnc = Abbv->getOperandInfo(++i);
+      if (!EltEnc.isEncoding())
+        report_fatal_error(
+            "Array element type has to be an encoding of a type");
       if (EltEnc.getEncoding() == BitCodeAbbrevOp::Array ||
           EltEnc.getEncoding() == BitCodeAbbrevOp::Blob)
         report_fatal_error("Array element type can't be an Array or a Blob");

Added: llvm/trunk/test/Bitcode/Inputs/invalid-array-operand-encoding.bc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/Inputs/invalid-array-operand-encoding.bc?rev=238269&view=auto
==============================================================================
Binary files llvm/trunk/test/Bitcode/Inputs/invalid-array-operand-encoding.bc (added) and llvm/trunk/test/Bitcode/Inputs/invalid-array-operand-encoding.bc Tue May 26 19:48:43 2015 differ

Modified: llvm/trunk/test/Bitcode/invalid.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/invalid.test?rev=238269&r1=238268&r2=238269&view=diff
==============================================================================
--- llvm/trunk/test/Bitcode/invalid.test (original)
+++ llvm/trunk/test/Bitcode/invalid.test Tue May 26 19:48:43 2015
@@ -177,3 +177,8 @@ RUN: not llvm-dis -disable-output %p/Inp
 RUN:   FileCheck --check-prefix=ABBREV-NO-OPS %s
 
 ABBREV-NO-OPS: Abbrev record with no operands
+
+RUN: not llvm-dis -disable-output %p/Inputs/invalid-array-operand-encoding.bc 2>&1 | \
+RUN:   FileCheck --check-prefix=ARRAY-OP-ENC %s
+
+ARRAY-OP-ENC: Array element type has to be an encoding of a type