From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 19 Jun 2021 12:33:18 +0000 (+0000)
Subject: build: Do not call globfree if glob has not been called
X-Git-Tag: 0.9.28~1228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b631c2f2a6a0ef434ea1a32ee9bc3b879320653a;p=pakfire.git

build: Do not call globfree if glob has not been called

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/build.c b/src/libpakfire/build.c
index b6975f49c..a2a1ce358 100644
--- a/src/libpakfire/build.c
+++ b/src/libpakfire/build.c
@@ -888,6 +888,7 @@ PAKFIRE_EXPORT int pakfire_build(Pakfire pakfire, const char* path,
 	r = glob(makefiles, 0, NULL, &buffer);
 	if (r) {
 		ERROR(pakfire, "glob() on %s failed: %m\n", makefiles);
+		globfree(&buffer);
 		goto ERROR;
 	}
 
@@ -895,14 +896,16 @@ PAKFIRE_EXPORT int pakfire_build(Pakfire pakfire, const char* path,
 	for (unsigned int i = 0; i < buffer.gl_pathc; i++) {
 		r = pakfire_build_makefile(pakfire, buffer.gl_pathv[i], target, id, flags,
 			logging_callback, data);
-		if (r)
+		if (r) {
+			ERROR(pakfire, "Could not build %s: %m\n", buffer.gl_pathv[i]);
+			globfree(&buffer);
 			goto ERROR;
+		}
 	}
 
 ERROR:
 	if (generated_id)
 		free(generated_id);
-	globfree(&buffer);
 
 	return r;
 }