Close manifest files after reading/writing them

diff --git a/manifest.c b/manifest.c
index c759f1cb81b9691f15155709d5a7fe32d4b69cfb..388000e5c112fc9c6bddeb2eb4af84820d63803f 100644 (file)
--- a/manifest.c
+++ b/manifest.c
@@ -634,10 +634,17 @@ int manifest_put(const char *manifest_path, struct file_hash *object_hash,
                mf = read_manifest(f1);
                if (!mf) {
                        cc_log("Failed to read manifest file");
+                       gzclose(f1);
                        goto out;
                }
        }
 
+       if (f1) {
+               gzclose(f1);
+       } else {
+               close(fd1);
+       }
+
        if (mf->n_objects > MAX_MANIFEST_ENTRIES) {
                /*
                 * Normally, there shouldn't be many object entries in the
@@ -673,6 +680,8 @@ int manifest_put(const char *manifest_path, struct file_hash *object_hash,
 
        add_object_entry(mf, object_hash, included_files);
        if (write_manifest(f2, mf)) {
+               gzclose(f2);
+               f2 = NULL;
                unlink(manifest_path);
                if (rename(tmp_file, manifest_path) == 0) {
                        ret = 1;
@@ -696,8 +705,5 @@ out:
        if (f2) {
                gzclose(f2);
        }
-       if (f1) {
-               gzclose(f1);
-       }
        return ret;
 }