From d2f778db43f0c703634e901fee7c929ebd0c8072 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 14 May 2026 18:41:02 +0200 Subject: Fix libtest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- libtest/libtest_fd_tracking.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libtest/libtest_fd_tracking.c') diff --git a/libtest/libtest_fd_tracking.c b/libtest/libtest_fd_tracking.c index 25cea8f..0dd69d2 100644 --- a/libtest/libtest_fd_tracking.c +++ b/libtest/libtest_fd_tracking.c @@ -60,7 +60,6 @@ libtest_fd_tracking(int action) DIR *dir; struct dirent *f; int ret = 1, dfd, name, digit; - int accept_memleak = libtest_malloc_accept_leakage; size_t i, j; char *path; int old_tracking_state; @@ -72,10 +71,7 @@ libtest_fd_tracking(int action) if (old_tracking_state == action) return 1; - /* so libtest doesn't complain about us not zeroing before freeing, - * and so it will not report memory leaks in fprintf from our - * resource leak report */ - libtest_malloc_accept_leakage = 1; + libtest_malloc_internal_usage++; dir = opendir("/dev/fd/"); assert(dir != NULL); @@ -95,6 +91,7 @@ next: continue; new_opened = realloc(new_opened, (new_nopened + 1u) * sizeof(*new_opened)); + assert(new_opened); new_opened[new_nopened].name = name; new_opened[new_nopened].leakable = action; new_nopened += 1u; @@ -146,7 +143,7 @@ next: nopened = 0u; } - libtest_malloc_accept_leakage = accept_memleak; + libtest_malloc_internal_usage--; return ret; } -- cgit v1.2.3-70-g09d2