From c4bffd7cefe05d4b1112532f556e104a90026ae6 Mon Sep 17 00:00:00 2001 From: gtsoul-tech Date: Tue, 23 Apr 2024 12:15:12 +0300 Subject: [PATCH 1/8] accessMoved cppcheck error --- src/rose/rose_build_merge.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rose/rose_build_merge.cpp b/src/rose/rose_build_merge.cpp index cddbb760..6dad3ecd 100644 --- a/src/rose/rose_build_merge.cpp +++ b/src/rose/rose_build_merge.cpp @@ -1599,7 +1599,8 @@ void dedupeLeftfixesVariableLag(RoseBuildImpl &build) { continue; } } - engine_groups[DedupeLeftKey(build, std::move(preds), left)].emplace_back(left); + auto preds_copy = preds; + engine_groups[DedupeLeftKey(build, std::move(preds_copy), left)].emplace_back(left); } /* We don't bother chunking as we expect deduping to be successful if the From 06fc35321dddf2fefa19e812ffa43e0dde3bfb91 Mon Sep 17 00:00:00 2001 From: gtsoul-tech Date: Tue, 23 Apr 2024 12:27:43 +0300 Subject: [PATCH 2/8] unsignedLessThanZero cppcheck --- src/parser/logical_combination.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parser/logical_combination.cpp b/src/parser/logical_combination.cpp index b75ca34f..a37f4e5f 100644 --- a/src/parser/logical_combination.cpp +++ b/src/parser/logical_combination.cpp @@ -284,7 +284,7 @@ void ParsedLogical::parseLogicalCombination(unsigned id, const char *logical, if (logical[i] == '(') { paren += 1; } else if (logical[i] == ')') { - if (paren <= 0) { + if (paren == 0) { throw LocatedParseError("Not enough left parentheses"); } paren -= 1; From 182f7ddb4775ead881959326fb3004f51ccab2fc Mon Sep 17 00:00:00 2001 From: gtsoul-tech Date: Tue, 23 Apr 2024 14:47:21 +0300 Subject: [PATCH 3/8] useInitializationList --- src/util/graph_small_color_map.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/graph_small_color_map.h b/src/util/graph_small_color_map.h index 249b7153..a85f4b77 100644 --- a/src/util/graph_small_color_map.h +++ b/src/util/graph_small_color_map.h @@ -102,10 +102,10 @@ public: using category = boost::read_write_property_map_tag; small_color_map(size_t n_in, const IndexMap &index_map_in) - : n(n_in), index_map(index_map_in) { - size_t num_bytes = (n + entries_per_byte - 1) / entries_per_byte; - data = std::make_shared>(num_bytes); - fill(small_color::white); + : n(n_in), + index_map(index_map_in), + data(std::make_shared>((n_in + entries_per_byte - 1) / entries_per_byte)) { + fill(small_color::white); } void fill(small_color color) { From 9d5753b215154a70c66739c9821f508bd3ce357e Mon Sep 17 00:00:00 2001 From: gtsoul-tech Date: Tue, 23 Apr 2024 14:48:12 +0300 Subject: [PATCH 4/8] comparisonOfBoolWithBoolError --- src/nfagraph/ng_limex_accel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nfagraph/ng_limex_accel.cpp b/src/nfagraph/ng_limex_accel.cpp index 8bac753d..ac5174f3 100644 --- a/src/nfagraph/ng_limex_accel.cpp +++ b/src/nfagraph/ng_limex_accel.cpp @@ -321,7 +321,7 @@ struct DAccelScheme { bool cd_a = buildDvermMask(a.double_byte); bool cd_b = buildDvermMask(b.double_byte); if (cd_a != cd_b) { - return cd_a > cd_b; + return cd_a; } } From 9316d65022efad69861e722dce1f49c9269611e8 Mon Sep 17 00:00:00 2001 From: gtsoul-tech Date: Tue, 23 Apr 2024 14:48:35 +0300 Subject: [PATCH 5/8] redundantContinue --- src/nfagraph/ng_squash.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nfagraph/ng_squash.cpp b/src/nfagraph/ng_squash.cpp index 0b51792b..b06a7af0 100644 --- a/src/nfagraph/ng_squash.cpp +++ b/src/nfagraph/ng_squash.cpp @@ -589,7 +589,7 @@ void getHighlanderReporters(const NGHolder &g, const NFAVertex accept, verts.insert(v); next_vertex: - continue; + ; } } From 73e00e2abce4865d67a4a45894ab014bab5951f5 Mon Sep 17 00:00:00 2001 From: gtsoul-tech Date: Tue, 23 Apr 2024 14:48:51 +0300 Subject: [PATCH 6/8] funcArgOrderDifferent --- src/nfagraph/ng_util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nfagraph/ng_util.h b/src/nfagraph/ng_util.h index a2d0d9b7..34199773 100644 --- a/src/nfagraph/ng_util.h +++ b/src/nfagraph/ng_util.h @@ -314,7 +314,7 @@ void duplicateReport(NGHolder &g, ReportID r_old, ReportID r_new); /** Construct a reversed copy of an arbitrary NGHolder, mapping starts to * accepts. */ -void reverseHolder(const NGHolder &g, NGHolder &out); +void reverseHolder(const NGHolder &g_in, NGHolder &g); /** \brief Returns the delay or ~0U if the graph cannot match with * the trailing literal. */ From 8d3a5d7cf1ee81d9699e03c8e7ad388715087f5c Mon Sep 17 00:00:00 2001 From: gtsoul-tech Date: Tue, 23 Apr 2024 14:48:58 +0300 Subject: [PATCH 7/8] legacyUninitvar --- src/util/alloc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/alloc.cpp b/src/util/alloc.cpp index 40004932..fb20f3d3 100644 --- a/src/util/alloc.cpp +++ b/src/util/alloc.cpp @@ -68,7 +68,7 @@ namespace ue2 { #endif void *aligned_malloc_internal(size_t size, size_t align) { - void *mem; + void *mem= nullptr;; int rv = posix_memalign(&mem, align, size); if (rv != 0) { DEBUG_PRINTF("posix_memalign returned %d when asked for %zu bytes\n", From 52b0076f4f09809fff8a7ccf9c477cdd6643ae61 Mon Sep 17 00:00:00 2001 From: gtsoul-tech Date: Tue, 23 Apr 2024 14:49:10 +0300 Subject: [PATCH 8/8] accessMoved --- src/rose/rose_build_merge.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rose/rose_build_merge.cpp b/src/rose/rose_build_merge.cpp index 6dad3ecd..1e6c9222 100644 --- a/src/rose/rose_build_merge.cpp +++ b/src/rose/rose_build_merge.cpp @@ -1599,8 +1599,8 @@ void dedupeLeftfixesVariableLag(RoseBuildImpl &build) { continue; } } - auto preds_copy = preds; - engine_groups[DedupeLeftKey(build, std::move(preds_copy), left)].emplace_back(left); + auto preds_copy = std::move(preds); + engine_groups[DedupeLeftKey(build, preds_copy , left)].emplace_back(left); } /* We don't bother chunking as we expect deduping to be successful if the