[PATCH] Fix fd leak in git-cvsimport-script

[git.git] / unpack-objects.c

diff --git a/unpack-objects.c b/unpack-objects.c
index 0d15c00..6383db9 100644 (file)
--- a/unpack-objects.c
+++ b/unpack-objects.c
@@ -55,8 +55,6 @@ static void *get_data(unsigned long size)
        z_stream stream;
        void *buf = xmalloc(size);
 
-       if (!size)
-               return buf;
        memset(&stream, 0, sizeof(stream));
 
        stream.next_out = buf;
@@ -155,7 +153,8 @@ static int unpack_non_delta_entry(enum object_type kind, unsigned long size)
        case OBJ_TAG:    type = "tag"; break;
        default: die("bad type %d", kind);
        }
-       write_object(buf, size, type);
+       if (!dry_run)
+               write_object(buf, size, type);
        free(buf);
        return 0;
 }
@@ -171,6 +170,10 @@ static int unpack_delta_entry(unsigned long delta_size)
        use(20);
 
        delta_data = get_data(delta_size);
+       if (dry_run) {
+               free(delta_data);
+               return 0;
+       }
 
        if (!has_sha1_file(base_sha1)) {
                add_delta_to_list(base_sha1, delta_data, delta_size);