From: g. economou <8426352+isildur-g@users.noreply.github.com>
Date: Thu, 2 May 2024 15:37:46 +0000 (+0300)
Subject: Merge branch 'develop' into wip-isildur-g-cppcheck66
X-Git-Tag: vectorscan/5.4.12^2~52^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13e5183be2b69ab5e927955b267e4c1140f3e19c;p=thirdparty%2Fvectorscan.git

Merge branch 'develop' into wip-isildur-g-cppcheck66
---

13e5183be2b69ab5e927955b267e4c1140f3e19c
diff --cc src/nfagraph/ng_fuzzy.cpp
index 0d6d76ad,20c76288..67d6348a
--- a/src/nfagraph/ng_fuzzy.cpp
+++ b/src/nfagraph/ng_fuzzy.cpp
@@@ -582,11 -582,11 +582,11 @@@ private
  
          // set up all reports
          bool clone = false;
-         for (auto &pair : reports_to_vertices) {
+         for (const auto &pair : reports_to_vertices) {
              const auto &reports = pair.first;
 -            const auto &vertices = pair.second;
 +            const auto &svertices = pair.second;
  
 -            for (auto src : vertices) {
 +            for (auto src : svertices) {
                  // get all predecessors up to edit distance
                  auto src_vertices_by_depth =
                          gatherPredecessorsByDepth(g, src, edit_distance);
diff --cc src/nfagraph/ng_som_add_redundancy.cpp
index 44afcee4,f8f953be..1467b157
--- a/src/nfagraph/ng_som_add_redundancy.cpp
+++ b/src/nfagraph/ng_som_add_redundancy.cpp
@@@ -112,9 -112,9 +112,9 @@@ bool forkVertex(NFAVertex v, NGHolder &
      }
      *numNewVertices += predGroups.size();
  
-     for (auto &group : predGroups) {
+     for (const auto &group : predGroups) {
          const depth &predDepth = group.first;
 -        const vector<NFAEdge> &preds = group.second;
 +        const vector<NFAEdge> &gspreds = group.second;
  
          // Clone v for this depth with all its associated out-edges.
          u32 clone_idx = depths.size(); // next index to be used
diff --cc src/rose/rose_build_merge.cpp
index ed2a350f,12843b9a..09c2175e
--- a/src/rose/rose_build_merge.cpp
+++ b/src/rose/rose_build_merge.cpp
@@@ -1599,7 -1599,8 +1599,8 @@@ void dedupeLeftfixesVariableLag(RoseBui
                  continue;
              }
          }
-         engine_groups[DedupeLeftKey(build, std::move(vpreds), left)].emplace_back(left);
 -        auto preds_copy = std::move(preds);
++        auto preds_copy = std::move(vpreds);
+         engine_groups[DedupeLeftKey(build, preds_copy , left)].emplace_back(left);
      }
  
      /* We don't bother chunking as we expect deduping to be successful if the