From: g. economou <8426352+isildur-g@users.noreply.github.com>
Date: Fri, 17 May 2024 08:08:09 +0000 (+0300)
Subject: Merge branch 'develop' into wip-cppcheck271-part2
X-Git-Tag: vectorscan/5.4.12^2~34^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22c3e3da6e759986a58a9d15105c9c9e484aad00;p=thirdparty%2Fvectorscan.git

Merge branch 'develop' into wip-cppcheck271-part2
---

22c3e3da6e759986a58a9d15105c9c9e484aad00
diff --cc src/nfagraph/ng_violet.cpp
index 635f9400,bf44d192..451376d9
--- a/src/nfagraph/ng_violet.cpp
+++ b/src/nfagraph/ng_violet.cpp
@@@ -1813,9 -1793,8 +1801,9 @@@ void removeRedundantLiterals(RoseInGrap
  }
  
  static
- RoseInVertex getStart(RoseInGraph &vg) {
+ RoseInVertex getStart(const RoseInGraph &vg) {
      for (RoseInVertex v : vertices_range(vg)) {
 +        // cppcheck-suppress useStlAlgorithm
          if (vg[v].type == RIV_START || vg[v].type == RIV_ANCHORED_START) {
              return v;
          }
diff --cc src/parser/ComponentRepeat.cpp
index f4c7e370,3319f67b..05deec54
--- a/src/parser/ComponentRepeat.cpp
+++ b/src/parser/ComponentRepeat.cpp
@@@ -110,10 -110,9 +110,10 @@@ void addBase(Position base, vector<Posi
  }
  
  static
- void checkPositions(vector<PositionInfo> &v, const GlushkovBuildState &bs) {
+ void checkPositions(const vector<PositionInfo> &v, const GlushkovBuildState &bs) {
      const NFABuilder& builder = bs.getBuilder();
      for (const auto &e : v) {
 +        // cppcheck-suppress useStlAlgorithm
          if (builder.isSpecialState(e.pos)) {
              throw ParseError("Embedded anchors not supported.");
          }
diff --cc src/rose/rose_build_bytecode.cpp
index ef3f6fdd,f7981729..7e3a9bab
--- a/src/rose/rose_build_bytecode.cpp
+++ b/src/rose/rose_build_bytecode.cpp
@@@ -989,8 -986,7 +989,8 @@@ bool checkSuitableForEager(bool is_pref
          return false;
      }
  
 +    // cppcheck-suppress useStlAlgorithm
-     for (RoseVertex s : succs) {
+     for (RoseVertex s : vsuccs) {
          if (build.isInETable(s)
              || contains(rg[s].literals, build.eod_event_literal_id)) {
              return false; /* Ignore EOD related prefixes */
diff --cc src/rose/rose_build_role_aliasing.cpp
index 0404a0c2,ae99c626..a762520d
--- a/src/rose/rose_build_role_aliasing.cpp
+++ b/src/rose/rose_build_role_aliasing.cpp
@@@ -258,10 -258,11 +258,12 @@@ bool samePredecessors(RoseVertex a, Ros
              return false;
          }
  
 +        // cppcheck-suppress useStlAlgorithm
          for (const auto &e_a : in_edges_range(a, g)) {
-             RoseEdge e = edge(source(e_a, g), b, g);
-             if (!e || g[e].rose_top != g[e_a].rose_top) {
+             auto edge_result = edge(source(e_a, g), b, g);
+             RoseEdge e = edge_result.first;
+             
+             if (!edge_result.second || g[e].rose_top != g[e_a].rose_top) {
                  DEBUG_PRINTF("bad tops\n");
                  return false;
              }
@@@ -274,9 -275,10 +276,11 @@@
  static
  bool hasCommonSuccWithBadBounds(RoseVertex a, RoseVertex b,
                                  const RoseGraph &g) {
 +    // cppcheck-suppress useStlAlgorithm
      for (const auto &e_a : out_edges_range(a, g)) {
-         if (RoseEdge e = edge(b, target(e_a, g), g)) {
+         auto edge_result = edge(b, target(e_a, g), g);
+         RoseEdge e = edge_result.first;
+         if (edge_result.second) {
              if (g[e_a].maxBound < g[e].minBound
                  || g[e].maxBound < g[e_a].minBound) {
                  return true;
@@@ -294,9 -296,10 +298,11 @@@
  static
  bool hasCommonPredWithBadBounds(RoseVertex a, RoseVertex b,
                                  const RoseGraph &g) {
 +    // cppcheck-suppress useStlAlgorithm
      for (const auto &e_a : in_edges_range(a, g)) {
-         if (RoseEdge e = edge(source(e_a, g), b, g)) {
+         auto edge_result = edge(source(e_a, g), b, g);
+         RoseEdge e = edge_result.first;
+         if (edge_result.second) {
              if (g[e_a].maxBound < g[e].minBound
                  || g[e].maxBound < g[e_a].minBound) {
                  return true;
@@@ -704,9 -705,10 +710,11 @@@ bool hasCommonPredWithDiffRoses(RoseVer
  
      const bool equal_roses = hasEqualLeftfixes(a, b, g);
  
 +    // cppcheck-suppress useStlAlgorithm
      for (const auto &e_a : in_edges_range(a, g)) {
-         if (RoseEdge e = edge(source(e_a, g), b, g)) {
+         auto edge_result = edge(source(e_a, g), b, g);
+         RoseEdge e = edge_result.first;
+         if (edge_result.second) {
              DEBUG_PRINTF("common pred, e_r=%d r_t %u,%u\n",
                           (int)equal_roses, g[e].rose_top, g[e_a].rose_top);
              if (!equal_roses) {