From 450b05125ef3483096b44e04bb7d9ae1af60d8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Czern=C3=BD?= Date: Thu, 29 Apr 2021 17:39:45 +0200 Subject: [PATCH] M #-: Fix minor memory sanitizer issues (#1137) (cherry picked from commit 8da704331251e3bd99a9229646f8af36277b55e6) --- src/vm_group/VMGroupRule.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/vm_group/VMGroupRule.cc b/src/vm_group/VMGroupRule.cc index e9f044f9d1..7bea56deef 100644 --- a/src/vm_group/VMGroupRule.cc +++ b/src/vm_group/VMGroupRule.cc @@ -50,6 +50,11 @@ bool VMGroupRule::compatible(rule_set& affined, rule_set& anti,VMGroupRule& err) void VMGroupRule::reduce(rule_set affined, rule_set& reduced_set) { + if (affined.empty()) + { + return; + } + VMGroupRule::rule_set::iterator it, jt; VMGroupRule reduced_rule; @@ -60,10 +65,6 @@ void VMGroupRule::reduce(rule_set affined, rule_set& reduced_set) for ( jt = affined.begin() ; jt != affined.end() ; ) { - VMGroupRule tmp = *it; - - tmp &= *jt; - if ( it == jt || (reduced_rule & *jt).none() ) { ++jt; @@ -82,7 +83,11 @@ void VMGroupRule::reduce(rule_set affined, rule_set& reduced_set) { reduced_set.insert(reduced_rule); - reduced_rule = *(++it); + ++it; + if (it != affined.end()) + { + reduced_rule = *it; + } } } }