From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 1/2] bundle: plug resource leak
Date: Tue, 01 Mar 2016 15:35:34 -0800 [thread overview]
Message-ID: <xmqqvb556abd.fsf@gitster.mtv.corp.google.com> (raw)
The bundle header structure holds two lists of refs and object
names, which should be released when the user is done with it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
bundle.c | 12 ++++++++++++
bundle.h | 1 +
transport.c | 1 +
3 files changed, 14 insertions(+)
diff --git a/bundle.c b/bundle.c
index 506ac49..9c5a6f0 100644
--- a/bundle.c
+++ b/bundle.c
@@ -102,6 +102,18 @@ int is_bundle(const char *path, int quiet)
return (fd >= 0);
}
+void release_bundle_header(struct bundle_header *header)
+{
+ int i;
+
+ for (i = 0; i < header->prerequisites.nr; i++)
+ free(header->prerequisites.list[i].name);
+ free(header->prerequisites.list);
+ for (i = 0; i < header->references.nr; i++)
+ free(header->references.list[i].name);
+ free(header->references.list);
+}
+
static int list_refs(struct ref_list *r, int argc, const char **argv)
{
int i;
diff --git a/bundle.h b/bundle.h
index 1584e4d..f7ce23b 100644
--- a/bundle.h
+++ b/bundle.h
@@ -23,5 +23,6 @@ int verify_bundle(struct bundle_header *header, int verbose);
int unbundle(struct bundle_header *header, int bundle_fd, int flags);
int list_bundle_refs(struct bundle_header *header,
int argc, const char **argv);
+void release_bundle_header(struct bundle_header *);
#endif
diff --git a/transport.c b/transport.c
index ca3cfa4..08e15c5 100644
--- a/transport.c
+++ b/transport.c
@@ -107,6 +107,7 @@ static int close_bundle(struct transport *transport)
struct bundle_transport_data *data = transport->data;
if (data->fd > 0)
close(data->fd);
+ release_bundle_header(&data->header);
free(data);
return 0;
}
--
2.8.0-rc0-114-g0b3e5e5
next reply other threads:[~2016-03-01 23:35 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 23:35 Junio C Hamano [this message]
2016-03-01 23:36 ` [PATCH 2/2] bundle: keep a copy of bundle file name in the in-core bundle header Junio C Hamano
2016-03-02 9:01 ` Jeff King
2016-03-02 18:15 ` Junio C Hamano
2016-03-02 20:32 ` [PATCH v2 0/4] "split bundle" preview Junio C Hamano
2016-03-02 20:32 ` [PATCH v2 1/4] bundle doc: 'verify' is not about verifying the bundle Junio C Hamano
2016-03-02 20:32 ` [PATCH v2 2/4] bundle: plug resource leak Junio C Hamano
2016-03-02 20:32 ` [PATCH v2 3/4] bundle: keep a copy of bundle file name in the in-core bundle header Junio C Hamano
2016-03-02 20:49 ` Jeff King
2016-03-02 20:32 ` [PATCH v2 4/4] bundle v3: the beginning Junio C Hamano
2016-03-03 1:36 ` Duy Nguyen
2016-03-03 2:57 ` Junio C Hamano
2016-03-03 5:15 ` Duy Nguyen
2016-05-20 12:39 ` Christian Couder
2016-05-31 12:43 ` Duy Nguyen
2016-05-31 13:18 ` Christian Couder
2016-06-01 13:37 ` Duy Nguyen
2016-06-07 14:49 ` Christian Couder
2016-06-01 14:00 ` Duy Nguyen
2016-06-07 8:46 ` Christian Couder
2016-06-07 8:53 ` Mike Hommey
2016-06-07 10:22 ` Duy Nguyen
2016-06-07 19:23 ` Junio C Hamano
2016-06-07 20:23 ` Jeff King
2016-06-08 10:44 ` Duy Nguyen
2016-06-08 16:19 ` Jeff King
2016-06-09 8:53 ` Duy Nguyen
2016-06-09 17:23 ` Jeff King
2016-06-08 18:05 ` Junio C Hamano
2016-06-08 19:00 ` Jeff King
2016-05-31 22:23 ` Jeff King
2016-05-31 22:31 ` Jeff King
2016-06-07 13:19 ` Christian Couder
2016-06-07 20:35 ` Jeff King
2016-03-02 8:54 ` [PATCH 1/2] bundle: plug resource leak Jeff King
2016-03-02 9:00 ` Junio C Hamano
2016-03-02 9:02 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqvb556abd.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).