Fix jump table analysis for 32-bit PIC code

dyninst · Jun 15, 2016 · 93707dd · 93707dd
1 parent 7ce040d
commit 93707dd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/parseAPI/src/IndirectASTVisitor.C b/parseAPI/src/IndirectASTVisitor.C
@@ -405,11 +405,11 @@ AST::Ptr JumpTableFormatVisitor::visit(DataflowAPI::RoseAST *ast) {
 	        findIncorrectFormat = true;
 	    } else if (roseAST->val().op == ROSEOperation::addOp) {
 	        Address tableBase = 0;
-		if (roseAST->child(0)->getID() == AST::V_ConstantAST) {
+		if (roseAST->child(0)->getID() == AST::V_ConstantAST && roseAST->child(1)->getID() == AST::V_VariableAST) {
 		    ConstantAST::Ptr constAST = boost::static_pointer_cast<ConstantAST>(roseAST->child(0));
 		    tableBase = constAST->val().val;
 		}
-		if (roseAST->child(1)->getID() == AST::V_ConstantAST) {
+		if (roseAST->child(1)->getID() == AST::V_ConstantAST && roseAST->child(0)->getID() == AST::V_VariableAST) {
 		    ConstantAST::Ptr constAST = boost::static_pointer_cast<ConstantAST>(roseAST->child(1));
 		    tableBase = constAST->val().val;
 		}