From: Chris Wilson <cwilson@vigilantsw.com>
To: git@vger.kernel.org
Subject: [PATCH] Fix config_file file leak.
Date: Thu, 14 Jul 2011 14:19:48 -0400 [thread overview]
Message-ID: <20110714181948.GA23288@localhost> (raw)
Hi,
We are using Sentry (a C/C++ static analysis tool) to analyze
git on a nightly basis. Sentry found that a file leak
was recently introduced in the commit 924aaf3.
I'm hoping the attached patch correctly fixes up this leak.
Thanks,
Chris
--
Chris Wilson
http://vigilantsw.com/
Vigilant Software, A C/C++ Static Analysis Company
---
config.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/config.c b/config.c
index 1fc063b..bf61f09 100644
--- a/config.c
+++ b/config.c
@@ -1434,7 +1434,7 @@ int git_config_rename_section(const char *old_name, const char *new
struct lock_file *lock = xcalloc(sizeof(struct lock_file), 1);
int out_fd;
char buf[1024];
- FILE *config_file;
+ FILE *config_file = 0;
if (config_exclusive_filename)
config_filename = xstrdup(config_exclusive_filename);
@@ -1498,12 +1498,13 @@ int git_config_rename_section(const char *old_name, const char *n
goto out;
}
}
- fclose(config_file);
unlock_and_out:
if (commit_lock_file(lock) < 0)
ret = error("could not commit config file %s", config_filename);
out:
free(config_filename);
+ if (config_file)
+ fclose(config_file);
return ret;
}
--
1.7.0.4
next reply other threads:[~2011-07-14 18:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-14 18:19 Chris Wilson [this message]
2011-07-14 18:29 ` [PATCH] Fix config_file file leak Chris Wilson
2011-07-19 17:28 ` Ramsay Jones
2011-07-20 13:12 ` Chris Wilson
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=20110714181948.GA23288@localhost \
--to=cwilson@vigilantsw.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.
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).