From: Tim Wiederhake <twiederh@redhat.com>
Date: Mon, 1 Feb 2021 11:27:48 +0000 (+0100)
Subject: commandhelper: Consolidate error paths
X-Git-Tag: v7.1.0-rc1~359
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d577767024b9421b656424d77f676a801b8286c;p=thirdparty%2Flibvirt.git

commandhelper: Consolidate error paths

Preparation for later conversion to g_auto* memory handling.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index 22835302b8..1ee697498c 100644
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
     ssize_t got;
 
     if (!log)
-        return ret;
+        goto cleanup;
 
     for (i = 1; i < argc; i++) {
         fprintf(log, "ARG:%s\n", argv[i]);
@@ -89,7 +89,7 @@ int main(int argc, char **argv) {
     }
 
     if (!(newenv = malloc(sizeof(*newenv) * n)))
-        abort();
+        goto cleanup;
 
     for (i = 0; i < n; i++) {
         newenv[i] = environ[i];
@@ -232,8 +232,10 @@ int main(int argc, char **argv) {
  cleanup:
     for (i = 0; i < G_N_ELEMENTS(buffers); i++)
         free(buffers[i]);
-    fclose(log);
-    free(newenv);
+    if (newenv)
+        free(newenv);
+    if (log)
+        fclose(log);
     return ret;
 }