From: Benjamin Otte <otte@redhat.com>
Date: Sun, 4 Jun 2023 18:15:24 +0000 (+0200)
Subject: testsuite: fix memleak
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~183^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8860a2a688ba75c0078f4334fce0912000417072;p=gtk4.git

testsuite: fix memleak

Also use the actual diff command we found instead of searching for it
again.
---

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
     {