Fix some more memory leaks in http-push.c

Signed-off-by: Mike Hommey <mh@glandium.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http-push.c b/http-push.c
index fffbe9ccb42e305d898a25a126918db0883b11cb..fc60bfd5f476abc94c3f70b5ea95373bd444e16f 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -925,11 +925,14 @@ static int fetch_index(unsigned char *sha1)
                                     hex);
                }
        } else {
                                     hex);
                }
        } else {

+               free(url);

                return error("Unable to start request");
        }
 
                return error("Unable to start request");
        }
 

-       if (has_pack_index(sha1))
+       if (has_pack_index(sha1)) {
+               free(url);

                return 0;
                return 0;

+       }

 
        if (push_verbosely)
                fprintf(stderr, "Getting index for pack %s\n", hex);
 
        if (push_verbosely)
                fprintf(stderr, "Getting index for pack %s\n", hex);


@@ -939,9 +942,11 @@ static int fetch_index(unsigned char *sha1)
        filename = sha1_pack_index_name(sha1);
        snprintf(tmpfile, sizeof(tmpfile), "%s.temp", filename);
        indexfile = fopen(tmpfile, "a");
        filename = sha1_pack_index_name(sha1);
        snprintf(tmpfile, sizeof(tmpfile), "%s.temp", filename);
        indexfile = fopen(tmpfile, "a");

-       if (!indexfile)
+       if (!indexfile) {
+               free(url);

                return error("Unable to open local file %s for pack index",
                             tmpfile);
                return error("Unable to open local file %s for pack index",
                             tmpfile);

+       }

 
        slot = get_active_slot();
        slot->results = &results;
 
        slot = get_active_slot();
        slot->results = &results;


@@ -1135,10 +1140,12 @@ int fetch_ref(char *ref, unsigned char *sha1)
        curl_easy_setopt(slot->curl, CURLOPT_URL, url);
        if (start_active_slot(slot)) {
                run_active_slot(slot);
        curl_easy_setopt(slot->curl, CURLOPT_URL, url);
        if (start_active_slot(slot)) {
                run_active_slot(slot);

+               free(url);

                if (results.curl_result != CURLE_OK)
                        return error("Couldn't get %s for %s\n%s",
                                     url, ref, curl_errorstr);
        } else {
                if (results.curl_result != CURLE_OK)
                        return error("Couldn't get %s for %s\n%s",
                                     url, ref, curl_errorstr);
        } else {

+               free(url);

                return error("Unable to start request");
        }
 
                return error("Unable to start request");
        }
 


@@ -2107,6 +2114,7 @@ static int remote_exists(const char *path)
 
         if (start_active_slot(slot)) {
                run_active_slot(slot);
 
         if (start_active_slot(slot)) {
                run_active_slot(slot);

+               free(url);

                if (results.http_code == 404)
                        return 0;
                else if (results.curl_result == CURLE_OK)
                if (results.http_code == 404)
                        return 0;
                else if (results.curl_result == CURLE_OK)


@@ -2114,6 +2122,7 @@ static int remote_exists(const char *path)
                else
                        fprintf(stderr, "HEAD HTTP error %ld\n", results.http_code);
        } else {
                else
                        fprintf(stderr, "HEAD HTTP error %ld\n", results.http_code);
        } else {

+               free(url);

                fprintf(stderr, "Unable to start HEAD request\n");
        }
 
                fprintf(stderr, "Unable to start HEAD request\n");
        }