send-pack: fix leaking common object IDs

We're leaking the array of common object IDs in `send_pack()`. Fix this
by creating a common exit path where we free the leaking data. While at
it, unify some other cleanups now that we have a central place to put
them.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/send-pack.c b/send-pack.c
index fa2f5eec17bba157f543a9233a36a73fb76af9aa..b224ef9fc5e27faffb69b0a1faa923d77393d256 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -508,7 +508,8 @@ int send_pack(struct send_pack_args *args,
        if (!remote_refs) {
                fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
                        "Perhaps you should specify a branch.\n");
-               return 0;
+               ret = 0;
+               goto out;
        }
 
        git_config_get_bool("push.negotiate", &push_negotiate);
@@ -615,12 +616,11 @@ int send_pack(struct send_pack_args *args,
                         * atomically, abort the whole operation.
                         */
                        if (use_atomic) {
-                               strbuf_release(&req_buf);
-                               strbuf_release(&cap_buf);
                                reject_atomic_push(remote_refs, args->send_mirror);
                                error("atomic push failed for ref %s. status: %d\n",
                                      ref->name, ref->status);
-                               return args->porcelain ? 0 : -1;
+                               ret = args->porcelain ? 0 : -1;
+                               goto out;
                        }
                        /* else fallthrough */
                default:
@@ -682,8 +682,6 @@ int send_pack(struct send_pack_args *args,
                write_or_die(out, req_buf.buf, req_buf.len);
                packet_flush(out);
        }
-       strbuf_release(&req_buf);
-       strbuf_release(&cap_buf);
 
        if (use_sideband && cmds_sent) {
                memset(&demux, 0, sizeof(demux));
@@ -721,7 +719,9 @@ int send_pack(struct send_pack_args *args,
                                finish_async(&demux);
                        }
                        fd[1] = -1;
-                       return -1;
+
+                       ret = -1;
+                       goto out;
                }
                if (!args->stateless_rpc)
                        /* Closed by pack_objects() via start_command() */
@@ -746,10 +746,12 @@ int send_pack(struct send_pack_args *args,
        }
 
        if (ret < 0)
-               return ret;
+               goto out;
 
-       if (args->porcelain)
-               return 0;
+       if (args->porcelain) {
+               ret = 0;
+               goto out;
+       }
 
        for (ref = remote_refs; ref; ref = ref->next) {
                switch (ref->status) {
@@ -758,8 +760,16 @@ int send_pack(struct send_pack_args *args,
                case REF_STATUS_OK:
                        break;
                default:
-                       return -1;
+                       ret = -1;
+                       goto out;
                }
        }
-       return 0;
+
+       ret = 0;
+
+out:
+       oid_array_clear(&commons);
+       strbuf_release(&req_buf);
+       strbuf_release(&cap_buf);
+       return ret;
 }

diff --git a/t/t5549-fetch-push-http.sh b/t/t5549-fetch-push-http.sh
index 2cdebcb735633209e0bbdfa07bc4765657b77ffa..6377fb6d99367820c9469bf73b98c4a5fb221569 100755 (executable)
--- a/t/t5549-fetch-push-http.sh
+++ b/t/t5549-fetch-push-http.sh
@@ -5,6 +5,7 @@ test_description='fetch/push functionality using the HTTP protocol'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd