nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't assert if materializing before seeing any function bodies

Browse Source 
This assert was reachable from user input. A minimized test case (no
FUNCTION_BLOCK_ID record) is attached.

Bug found with afl-fuzz

llvm-svn: 251910
This commit is contained in:
Filipe Cabecinhas
2015-11-03 13:48:26 +00:00
parent f3e167af4b
commit 7aae2f23c8
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/Bitcode/Reader/BitcodeReader.cpp
View File

@@ -3055,7 +3055,9 @@ std::error_code BitcodeReader::rememberAndSkipFunctionBodies() {
if (Stream.AtEndOfStream()) if (Stream.AtEndOfStream())
return error("Could not find function in stream"); return error("Could not find function in stream");
assert(SeenFirstFunctionBody); if (!SeenFirstFunctionBody)
return error("Trying to materialize functions before seeing function blocks");
// An old bitcode file with the symbol table at the end would have // An old bitcode file with the symbol table at the end would have
// finished the parse greedily. // finished the parse greedily.
assert(SeenValueSymbolTable); assert(SeenValueSymbolTable);

BIN
llvm/test/Bitcode/Inputs/invalid-no-function-block.bc Normal file
View File

Binary file not shown.

5
llvm/test/Bitcode/invalid.test
View File

@@ -207,3 +207,8 @@ RUN: not llvm-dis -disable-output %p/Inputs/invalid-alias-type-mismatch.bc 2>&1
RUN: FileCheck --check-prefix=ALIAS-TYPE-MISMATCH %s RUN: FileCheck --check-prefix=ALIAS-TYPE-MISMATCH %s
ALIAS-TYPE-MISMATCH: Alias and aliasee types don't match ALIAS-TYPE-MISMATCH: Alias and aliasee types don't match
RUN: not llvm-dis -disable-output %p/Inputs/invalid-no-function-block.bc 2>&1 | \
RUN: FileCheck --check-prefix=NO-FUNCTION-BLOCK %s
NO-FUNCTION-BLOCK: Trying to materialize functions before seeing function blocks