From b81a7f09bb88b71e7c09dc1ac1d448e09b2ef6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr> Date: Wed, 30 Jun 2021 08:30:18 +0000 Subject: [PATCH] [Eva] Minor fixes in the taint domain following review. --- src/plugins/value/domains/taint_domain.ml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/value/domains/taint_domain.ml b/src/plugins/value/domains/taint_domain.ml index b1406f526ec..f48720413af 100644 --- a/src/plugins/value/domains/taint_domain.ml +++ b/src/plugins/value/domains/taint_domain.ml @@ -419,13 +419,13 @@ module TaintLogic = struct | false, Por (p1, p2) -> let state = reduce_by_predicate cvalue_env state p1 positive in reduce_by_predicate cvalue_env state p2 positive - | true,Por (p1,p2 ) - | false,Pand (p1, p2) -> + | true, Por (p1, p2) + | false, Pand (p1, p2) -> let state1 = reduce_by_predicate cvalue_env state p1 positive in let state2 = reduce_by_predicate cvalue_env state p2 positive in join state1 state2 | _, Pnot p -> reduce_by_predicate cvalue_env state p (not positive) - | _, Papp ( {l_var_info = {lv_name = "\\tainted"}}, _labels, [arg]) -> + | _, Papp ({l_var_info = {lv_name = "\\tainted"}}, _labels, [arg]) -> reduce_by_taint_predicate cvalue_env state arg positive | _ -> state @@ -440,7 +440,7 @@ module TaintLogic = struct let evaluate_predicate cvalue_env state predicate = let rec evaluate predicate = match predicate.pred_content with - | Papp ( {l_var_info = {lv_name = "\\tainted"}}, _labels, [arg]) -> + | Papp ({l_var_info = {lv_name = "\\tainted"}}, _labels, [arg]) -> evaluate_taint_predicate cvalue_env state arg | Ptrue -> True | Pfalse -> False @@ -489,7 +489,8 @@ module TaintLogic = struct List.fold_left taint_term taint terms end -let interpret_taint_logic (module Abstract: Abstractions.S) : (module Abstractions.S) = +let interpret_taint_logic + (module Abstract: Abstractions.S) : (module Abstractions.S) = match Abstract.Dom.get Cvalue_domain.State.key, Abstract.Dom.get key with | None, _ | _, None -> (module Abstract) -- GitLab