From: Sven Strickroth <sven@cs-ware.de>
To: Eric Sunshine <sunshine@sunshineco.com>,
Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH] Correctly close config file handle in case of error
Date: Fri, 14 Aug 2015 21:44:17 +0200 [thread overview]
Message-ID: <55CE4511.6050704@cs-ware.de> (raw)
In-Reply-To: <CAPig+cQMng-bPjO3WLYb1z7aghYhhHqewSr+EGFgV6Gs6_JZRQ@mail.gmail.com>
Without this patch there might be open file handle leaks.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
config.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/config.c b/config.c
index 9fd275f..c06dc2f 100644
--- a/config.c
+++ b/config.c
@@ -2010,6 +2010,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
error("invalid pattern: %s", value_regex);
free(store.value_regex);
ret = CONFIG_INVALID_PATTERN;
+ close(in_fd);
goto out_free;
}
}
@@ -2034,6 +2035,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
free(store.value_regex);
}
ret = CONFIG_INVALID_FILE;
+ close(in_fd);
goto out_free;
}
@@ -2048,6 +2050,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
if ((store.seen == 0 && value == NULL) ||
(store.seen > 1 && multi_replace == 0)) {
ret = CONFIG_NOTHING_SET;
+ close(in_fd);
goto out_free;
}
@@ -2062,6 +2065,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
config_filename, strerror(errno));
ret = CONFIG_INVALID_FILE;
contents = NULL;
+ close(in_fd);
goto out_free;
}
close(in_fd);
--
Best regards,
Sven Strickroth
PGP key id F5A9D4C4 @ any key-server
next prev parent reply other threads:[~2015-08-14 19:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-14 19:18 [PATCH] Close config file handle if the entry to unset is not found Sven Strickroth
2015-08-14 19:35 ` Eric Sunshine
2015-08-14 19:38 ` Sven Strickroth
2015-08-14 19:44 ` Sven Strickroth [this message]
2015-08-14 19:54 ` [PATCH] Correctly close config file handle in case of error Eric Sunshine
2015-08-14 20:03 ` Sven Strickroth
2015-08-14 20:14 ` Eric Sunshine
2015-08-14 20:21 ` Sven Strickroth
2015-08-14 20:32 ` Eric Sunshine
2015-08-14 21:00 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55CE4511.6050704@cs-ware.de \
--to=sven@cs-ware.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.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.
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 NNTP newsgroup(s).