From 0ec5f501964010d4a186a51438338656eebe7912 Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Sat, 16 May 2020 14:01:54 -0700 Subject: Harden IR and bitcode parsers against infinite size types. If isSized is passed a SmallPtrSet, it uses that set to catch infinitely recursive types (for example, a struct that has itself as a member). Otherwise, it just crashes on such types. --- llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp') diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 64427b7..7b62bab 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -4857,7 +4857,8 @@ Error BitcodeReader::parseFunctionBody(Function *F) { MaybeAlign Align; if (Error Err = parseAlignmentValue(Record[OpNum], Align)) return Err; - if (!Align && !Ty->isSized()) + SmallPtrSet Visited; + if (!Align && !Ty->isSized(&Visited)) return error("load of unsized type"); if (!Align) Align = TheModule->getDataLayout().getABITypeAlign(Ty); @@ -4922,6 +4923,9 @@ Error BitcodeReader::parseFunctionBody(Function *F) { MaybeAlign Align; if (Error Err = parseAlignmentValue(Record[OpNum], Align)) return Err; + SmallPtrSet Visited; + if (!Align && !Val->getType()->isSized(&Visited)) + return error("store of unsized type"); if (!Align) Align = TheModule->getDataLayout().getABITypeAlign(Val->getType()); I = new StoreInst(Val, Ptr, Record[OpNum + 1], *Align); -- cgit v1.1