From bce2dc409335d71c880581b1a883356e6c1ecdb2 Mon Sep 17 00:00:00 2001
From: Anh Nguyen-Tuong <zenpoems@gmail.com>
Date: Tue, 19 Mar 2019 16:34:21 -0400
Subject: [PATCH] Fix option parsing bug

---
 bin/zafl.sh            | 4 ++--
 tools/zax/zax_base.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/zafl.sh b/bin/zafl.sh
index 2b631c9..73857f1 100755
--- a/bin/zafl.sh
+++ b/bin/zafl.sh
@@ -214,11 +214,11 @@ parse_args()
 				shift
 				case $1 in
 					function)
-						zax_opt=" -o zax:\"--enable-context-sensitivity function\" "
+						zax_opt=" $zax_opt -o zax:\"--enable-context-sensitivity function\" "
 						shift
 					;;
 					callsite)
-						zax_opt=" -o zax:\"--enable-context-sensitivity callsite\" "
+						zax_opt=" $zax_opt -o zax:\"--enable-context-sensitivity callsite\" "
 						echo "Error: context sensitivity <callsite> currently unsupported"
 						exit 1
 					;;
diff --git a/tools/zax/zax_base.cpp b/tools/zax/zax_base.cpp
index f873790..2fc3310 100644
--- a/tools/zax/zax_base.cpp
+++ b/tools/zax/zax_base.cpp
@@ -1276,7 +1276,7 @@ int ZaxBase_t::execute()
 		if (getContextSensitivity() != ContextSensitivity_None)
 		{
 			// this handles inserting the calling context sensitivity value
-			// at entry and exits of functions (todo: or at call sites a la Angora)
+			// at entry and exits of functions
  			getFileIR()->assembleRegistry();
 		 	getFileIR()->setBaseIDS();
 			auto cs_cfg=ControlFlowGraph_t::factory(f);	
-- 
GitLab