From 22147be898fd5a1737efd677244c2c5618644e7e Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 22 Apr 2010 18:41:32 -0700 Subject: [PATCH] ir_function_inlining: Avoid NULL dereference on assignment conditions. --- ir_function_inlining.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ir_function_inlining.cpp b/ir_function_inlining.cpp index c0e77b42730..025124ae2b2 100644 --- a/ir_function_inlining.cpp +++ b/ir_function_inlining.cpp @@ -214,7 +214,7 @@ ir_function_cloning_visitor::visit(ir_dereference *ir) void ir_function_cloning_visitor::visit(ir_assignment *ir) { - ir_rvalue *lhs, *rhs, *condition; + ir_rvalue *lhs, *rhs, *condition = NULL; ir->lhs->accept(this); lhs = this->result->as_rvalue(); @@ -222,8 +222,10 @@ ir_function_cloning_visitor::visit(ir_assignment *ir) ir->rhs->accept(this); rhs = this->result->as_rvalue(); - ir->condition->accept(this); - condition = this->result->as_rvalue(); + if (ir->condition) { + ir->condition->accept(this); + condition = this->result->as_rvalue(); + } this->result = new ir_assignment(lhs, rhs, condition); } -- 2.30.2