diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml index 38e90cb760a..4609aa88621 100644 --- a/.github/workflows/asan.yml +++ b/.github/workflows/asan.yml @@ -23,7 +23,6 @@ jobs: env: QT_VERSION: 6.10.0 ASAN_OPTIONS: detect_stack_use_after_return=1 - LSAN_OPTIONS: suppressions=lsan-suppr.txt:print_suppressions=0 # TODO: figure out why there are cache misses with PCH enabled CCACHE_SLOPPINESS: pch_defines,time_macros @@ -100,7 +99,6 @@ jobs: - name: Run CTest run: | - cp lsan-suppr.txt cmake.output/bin ctest --test-dir cmake.output --output-on-failure -j$(nproc) - name: Run test/cli diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 9a6026aa25b..e0192351906 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -51,7 +51,7 @@ jobs: - name: Run valgrind run: | ec=0 - valgrind --error-limit=yes --leak-check=full --num-callers=50 --show-reachable=yes --track-origins=yes --suppressions=valgrind/testrunner.supp --gen-suppressions=all --log-fd=9 --error-exitcode=42 ./testrunner TestGarbage TestOther TestSimplifyTemplate 9>memcheck.log || ec=1 + valgrind --error-limit=yes --leak-check=full --num-callers=50 --show-reachable=yes --track-origins=yes --suppressions=valgrind/testrunner.supp --gen-suppressions=all -s --log-fd=9 --error-exitcode=42 ./testrunner TestGarbage TestOther TestSimplifyTemplate TestRegEx 9>memcheck.log || ec=1 cat memcheck.log exit $ec # TODO: debuginfod.ubuntu.com is currently not responding to any requests causing it to run into a 40(!) minute timeout diff --git a/lib/regex.cpp b/lib/regex.cpp index 6ad9ad440b0..af3bf44e7cc 100644 --- a/lib/regex.cpp +++ b/lib/regex.cpp @@ -167,7 +167,7 @@ namespace { ~PcreRegex() override { if (mExtra) { - pcre_free(mExtra); + pcre_free_study(mExtra); mExtra = nullptr; } if (mRe) { diff --git a/lsan-suppr.txt b/lsan-suppr.txt deleted file mode 100644 index bf8389f247e..00000000000 --- a/lsan-suppr.txt +++ /dev/null @@ -1 +0,0 @@ -leak:libpcre.so \ No newline at end of file diff --git a/valgrind/testrunner.supp b/valgrind/testrunner.supp index 98e30d241ce..558e74a2aca 100644 --- a/valgrind/testrunner.supp +++ b/valgrind/testrunner.supp @@ -14,3 +14,9 @@ obj:* obj:* } +{ + TestRegEx::partialmatch false positive + Memcheck:Cond + obj:* + obj:* +}