This is an archive of the discontinued LLVM Phabricator instance.

Differential D9308

Relax an assert when there's a type mismatch in forward references
ClosedPublic

Authored by filcab on Apr 27 2015, 3:34 PM.

Details

Reviewers
• rafael
Commits
rGb435d0f43954: Relax an assert when there's a type mismatch in forward references
rL236027: Relax an assert when there's a type mismatch in forward references
Summary

We don't seem to need to assert here, since this function's callers expect
to get a nullptr on error. This way we don't assert on user input.

Bug found with AFL fuzz.

Diff Detail

Repository
rL LLVM

Event Timeline

filcab updated this revision to Diff 24507.Apr 27 2015, 3:34 PM
filcab retitled this revision from to Relax an assert when there's a type mismatch in forward references.
filcab updated this object.
filcab edited the test plan for this revision. (Show Details)
filcab added a reviewer: • rafael.
filcab added a subscriber: Unknown Object (MLST).
• rafael edited edge metadata.Apr 27 2015, 3:41 PM

LGTM

Closed by commit rL236027: Relax an assert when there's a type mismatch in forward references (authored by filcab). · Explain WhyApr 28 2015, 1:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
lib/
Bitcode/
Reader/
4 lines
test/
Bitcode/
Inputs/
5 lines

Diff 24571

llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp

Show First 20 Lines • Show All 788 Lines • ▼ Show 20 LinesConstant *BitcodeReaderValueList::getConstantFwdRef(unsigned Idx,
return C; return C;
} }
Value *BitcodeReaderValueList::getValueFwdRef(unsigned Idx, Type *Ty) { Value *BitcodeReaderValueList::getValueFwdRef(unsigned Idx, Type *Ty) {
if (Idx >= size()) if (Idx >= size())
resize(Idx + 1); resize(Idx + 1);
if (Value *V = ValuePtrs[Idx]) { if (Value *V = ValuePtrs[Idx]) {
assert((!Ty || Ty == V->getType()) && "Type mismatch in value table!"); // If the types don't match, it's invalid.
if (Ty && Ty != V->getType())
return nullptr;
return V; return V;
} }
// No type specified, must be invalid reference. // No type specified, must be invalid reference.
if (!Ty) return nullptr; if (!Ty) return nullptr;
// Create and return a placeholder, which will later be RAUW'd. // Create and return a placeholder, which will later be RAUW'd.
Value *V = new Argument(Ty); Value *V = new Argument(Ty);
▲ Show 20 Lines • Show All 3,873 Lines • Show Last 20 Lines

llvm/trunk/test/Bitcode/Inputs/invalid-fwdref-type-mismatch.bc

  • This is a binary file.

llvm/trunk/test/Bitcode/invalid.test

Show First 20 Lines • Show All 87 Lines • ▼ Show 20 Lines
RUN: not llvm-dis -disable-output %p/Inputs/invalid-non-vector-extractelement.bc 2>&1 | \ RUN: not llvm-dis -disable-output %p/Inputs/invalid-non-vector-extractelement.bc 2>&1 | \
RUN: FileCheck --check-prefix=INVALID-TYPE %s RUN: FileCheck --check-prefix=INVALID-TYPE %s
RUN: not llvm-dis -disable-output %p/Inputs/invalid-non-vector-insertelement.bc 2>&1 | \ RUN: not llvm-dis -disable-output %p/Inputs/invalid-non-vector-insertelement.bc 2>&1 | \
RUN: FileCheck --check-prefix=INVALID-TYPE %s RUN: FileCheck --check-prefix=INVALID-TYPE %s
RUN: not llvm-dis -disable-output %p/Inputs/invalid-non-vector-shufflevector.bc 2>&1 | \ RUN: not llvm-dis -disable-output %p/Inputs/invalid-non-vector-shufflevector.bc 2>&1 | \
RUN: FileCheck --check-prefix=INVALID-TYPE %s RUN: FileCheck --check-prefix=INVALID-TYPE %s
INVALID-TYPE: Invalid type for value INVALID-TYPE: Invalid type for value
RUN: not llvm-dis -disable-output %p/Inputs/invalid-fwdref-type-mismatch.bc 2>&1 | \
RUN: FileCheck --check-prefix=FWDREF-TYPE %s
FWDREF-TYPE: Invalid record