bin2llvmir: check data types before using them in functions and allocas

fix #535
avast · Jun 25, 2019 · bebaf4d · bebaf4d
1 parent cb771a6
commit bebaf4d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/bin2llvmir/optimizations/value_protect/value_protect.cpp b/src/bin2llvmir/optimizations/value_protect/value_protect.cpp
@@ -392,6 +392,10 @@ void ValueProtect::protectValue(
 		llvm::Instruction* before)
 {
 	Function* fnc = getOrCreateFunction(t);
+	if (fnc == nullptr)
+	{
+		return;
+	}
 	auto* c = CallInst::Create(fnc);
 	c->insertBefore(before);
 	auto* s = new StoreInst(c, val);
@@ -553,6 +557,11 @@ llvm::Function* ValueProtect::getOrCreateFunction(llvm::Type* t)
 
 llvm::Function* ValueProtect::createFunction(llvm::Type* t)
 {
+	if (!FunctionType::isValidReturnType(t))
+	{
+		return nullptr;
+	}
+
 	FunctionType* ft = FunctionType::get(t, false);
 	auto* fnc = Function::Create(
 			ft,

diff --git a/src/bin2llvmir/utils/ir_modifier.cpp b/src/bin2llvmir/utils/ir_modifier.cpp
@@ -537,7 +537,7 @@ IrModifier::StackPair IrModifier::getStackVariable(
 		llvm::Type* type,
 		const std::string& name)
 {
-	if (!PointerType::isValidElementType(type))
+	if (!PointerType::isValidElementType(type) || !type->isSized())
 	{
 		type = Abi::getDefaultType(fnc->getParent());
 	}