[llvm] r238272 - [BitcodeReader] Change assert to report_fatal_error
Filipe Cabecinhas
me at filcab.net
Tue May 26 18:05:41 PDT 2015
Author: filcab
Date: Tue May 26 20:05:40 2015
New Revision: 238272
URL: http://llvm.org/viewvc/llvm-project?rev=238272&view=rev
Log:
[BitcodeReader] Change assert to report_fatal_error
It can be triggered by user input.
Bug found with AFL fuzz.
Added:
llvm/trunk/test/Bitcode/Inputs/invalid-fwdref-type-mismatch-2.bc
Modified:
llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
llvm/trunk/test/Bitcode/invalid.test
Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=238272&r1=238271&r2=238272&view=diff
==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Tue May 26 20:05:40 2015
@@ -785,7 +785,8 @@ Constant *BitcodeReaderValueList::getCon
resize(Idx + 1);
if (Value *V = ValuePtrs[Idx]) {
- assert(Ty == V->getType() && "Type mismatch in constant table!");
+ if (Ty != V->getType())
+ report_fatal_error("Type mismatch in constant table!");
return cast<Constant>(V);
}
Added: llvm/trunk/test/Bitcode/Inputs/invalid-fwdref-type-mismatch-2.bc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/Inputs/invalid-fwdref-type-mismatch-2.bc?rev=238272&view=auto
==============================================================================
Binary files llvm/trunk/test/Bitcode/Inputs/invalid-fwdref-type-mismatch-2.bc (added) and llvm/trunk/test/Bitcode/Inputs/invalid-fwdref-type-mismatch-2.bc Tue May 26 20:05:40 2015 differ
Modified: llvm/trunk/test/Bitcode/invalid.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/invalid.test?rev=238272&r1=238271&r2=238272&view=diff
==============================================================================
--- llvm/trunk/test/Bitcode/invalid.test (original)
+++ llvm/trunk/test/Bitcode/invalid.test Tue May 26 20:05:40 2015
@@ -99,6 +99,11 @@ RUN: FileCheck --check-prefix=FWDREF-T
FWDREF-TYPE: Invalid record
+RUN: not llvm-dis -disable-output %p/Inputs/invalid-fwdref-type-mismatch-2.bc 2>&1 | \
+RUN: FileCheck --check-prefix=FWDREF-TYPE-MISMATCH %s
+
+FWDREF-TYPE-MISMATCH: Type mismatch in constant table!
+
RUN: not llvm-dis -disable-output %p/Inputs/invalid-array-element-type.bc 2>&1 | \
RUN: FileCheck --check-prefix=ELEMENT-TYPE %s
RUN: not llvm-dis -disable-output %p/Inputs/invalid-vector-element-type.bc 2>&1 | \
More information about the llvm-commits
mailing list