From 8860a2a688ba75c0078f4334fce0912000417072 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sun, 4 Jun 2023 20:15:24 +0200 Subject: [PATCH] testsuite: fix memleak Also use the actual diff command we found instead of searching for it again. --- testsuite/testutils.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/testsuite/testutils.c b/testsuite/testutils.c index d1776da7b5..6e8ba8e940 100644 --- a/testsuite/testutils.c +++ b/testsuite/testutils.c @@ -34,14 +34,16 @@ diff_with_file (const char *file1, gssize len, GError **error) { - const char *command[] = { "diff", "-u", file1, NULL, NULL }; - char *diff, *tmpfile; + char *diff_cmd, *diff, *tmpfile; int fd; diff = NULL; - if (g_find_program_in_path ("diff")) + diff_cmd = g_find_program_in_path ("diff"); + if (diff_cmd) { + const char *command[] = { diff_cmd, "-u", file1, NULL, NULL }; + if (len < 0) len = strlen (text); @@ -65,7 +67,7 @@ diff_with_file (const char *file1, g_spawn_sync (NULL, (char **) command, NULL, - G_SPAWN_SEARCH_PATH, + 0, NULL, NULL, &diff, NULL, NULL, @@ -74,6 +76,7 @@ diff_with_file (const char *file1, done: g_unlink (tmpfile); g_free (tmpfile); + g_free (diff_cmd); } else { -- 2.30.2