From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Stefan Beller <sbeller@google.com>
Subject: [PATCH 5/6] bundle: don't leak an fd in case of early return
Date: Tue, 29 Mar 2016 17:38:52 -0700 [thread overview]
Message-ID: <1459298333-21899-6-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1459298333-21899-1-git-send-email-sbeller@google.com>
In successful operation `write_pack_data` will close the `bundle_fd`,
but when we exit early, we need to take care of the file descriptor
ourselves.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
bundle.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/bundle.c b/bundle.c
index 506ac49..04d62af 100644
--- a/bundle.c
+++ b/bundle.c
@@ -434,8 +434,11 @@ int create_bundle(struct bundle_header *header, const char *path,
init_revisions(&revs, NULL);
/* write prerequisites */
- if (compute_and_write_prerequisites(bundle_fd, &revs, argc, argv))
+ if (compute_and_write_prerequisites(bundle_fd, &revs, argc, argv)) {
+ if (!bundle_to_stdout)
+ close(bundle_fd);
return -1;
+ }
argc = setup_revisions(argc, argv, &revs, NULL);
@@ -447,8 +450,11 @@ int create_bundle(struct bundle_header *header, const char *path,
ref_count = write_bundle_refs(bundle_fd, &revs);
if (!ref_count)
die(_("Refusing to create empty bundle."));
- else if (ref_count < 0)
+ else if (ref_count < 0) {
+ if (!bundle_to_stdout)
+ close(bundle_fd);
return -1;
+ }
/* write pack */
if (write_pack_data(bundle_fd, &revs))
--
2.8.0.8.g27a27a6.dirty
next prev parent reply other threads:[~2016-03-30 0:39 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 0:38 [PATCH 0/6] Some cleanups Stefan Beller
2016-03-30 0:38 ` [PATCH 1/6] path.c: allocate enough memory for string Stefan Beller
2016-03-30 0:56 ` Junio C Hamano
2016-03-30 0:57 ` Eric Sunshine
2016-03-30 16:41 ` Stefan Beller
2016-03-30 17:16 ` Junio C Hamano
2016-03-30 0:38 ` [PATCH 2/6] imap-send.c, cram: allocate enough memory for null terminated string Stefan Beller
2016-03-30 1:02 ` Eric Sunshine
2016-03-30 1:07 ` Jeff King
2016-03-30 0:38 ` [PATCH 3/6] notes: don't leak memory in git_config_get_notes_strategy Stefan Beller
2016-03-30 1:11 ` Eric Sunshine
2016-03-30 1:13 ` Jeff King
2016-03-30 17:17 ` Junio C Hamano
2016-03-30 0:38 ` [PATCH 4/6] abbrev_sha1_in_line: don't leak memory Stefan Beller
2016-03-30 1:11 ` Jeff King
2016-03-30 1:30 ` Eric Sunshine
2016-03-30 1:31 ` Jeff King
2016-03-30 17:06 ` Junio C Hamano
2016-03-30 17:21 ` Jeff King
2016-03-30 0:38 ` Stefan Beller [this message]
2016-03-30 1:17 ` [PATCH 5/6] bundle: don't leak an fd in case of early return Jeff King
2016-03-30 17:19 ` Junio C Hamano
2016-03-30 0:38 ` [PATCH 6/6] credential-cache, send_request: close fd when done Stefan Beller
2016-03-30 1:20 ` 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=1459298333-21899-6-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).