From f0c0ec59dfbe30ebfdb3116439dae58945af5ba7 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 3 Jun 2022 16:38:16 +0200 Subject: [PATCH] Fix memory leaks This renders these simple tests ASAN and LSAN (Address Sanitizer and Leak Sanitizer) clean. Change-Id: Ibe5b7054a20c1575a1a7939b0bed4101afeeee56 Reviewed-by: Marc Mutz Reviewed-by: Thiago Macieira Reviewed-by: Alexandru Croitor --- .../cmake/test_add_binary_resources_delayed_file/main.cpp | 1 + tests/auto/cmake/test_add_resources_binary_generated/main.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/tests/auto/cmake/test_add_binary_resources_delayed_file/main.cpp b/tests/auto/cmake/test_add_binary_resources_delayed_file/main.cpp index 46f4f1028d8..b8b6ec77173 100644 --- a/tests/auto/cmake/test_add_binary_resources_delayed_file/main.cpp +++ b/tests/auto/cmake/test_add_binary_resources_delayed_file/main.cpp @@ -9,6 +9,7 @@ int main(int argc, char **argv) if (QResource::registerResource("rcc_file.rcc") && QFile::exists("://resource_file.txt") && QFile::exists("://resource_file_two.txt")) { + QResource::unregisterResource("rcc_file.rcc"); // avoid leaks return 0; } diff --git a/tests/auto/cmake/test_add_resources_binary_generated/main.cpp b/tests/auto/cmake/test_add_resources_binary_generated/main.cpp index 65d5ff306b2..906232ca19a 100644 --- a/tests/auto/cmake/test_add_resources_binary_generated/main.cpp +++ b/tests/auto/cmake/test_add_resources_binary_generated/main.cpp @@ -12,5 +12,9 @@ int main(int, char **) || !QFile::exists(":/resource2.txt")) { return -1; } + + // Avoid leaks + QResource::unregisterResource(RESOURCE1_FULL_PATH); + QResource::unregisterResource(RESOURCE2_FULL_PATH); return 0; }