]> git.ipfire.org Git - pakfire.git/commitdiff
build: Do not call globfree if glob has not been called
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 Jun 2021 12:33:18 +0000 (12:33 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 Jun 2021 12:35:22 +0000 (12:35 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/libpakfire/build.c

index b6975f49c6ee586e7dc7f3dba962d7867cb67614..a2a1ce3584b490d7bd49bf7d08b575d8d4bd98ce 100644 (file)
@@ -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;
 }