From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Jonathon Mah" <jmah@me.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Duy Nguyen" <pclouds@gmail.com>,
"Stefan Näwe" <stefan.naewe@atlas-elektronik.com>,
Armin <netzverweigerer@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: [PATCH 1/3] commit: drop useless xstrdup of commit message
Date: Sat, 26 Jan 2013 04:42:45 -0500 [thread overview]
Message-ID: <20130126094236.GA6999@sigill.intra.peff.net> (raw)
In-Reply-To: <20130126094026.GA9646@sigill.intra.peff.net>
When git-commit is asked to reuse a commit message via "-c",
we call read_commit_message, which looks up the commit and
hands back either the re-encoded result, or a copy of the
original. We make a copy in the latter case so that the
ownership semantics of the return value are clear (in either
case, it can be freed).
However, since we return a "const char *", and since the
resulting buffer's lifetime is the same as that of the whole
program, we never bother to free it at all.
Let's just drop the copy. That saves us a copy in the common
case. While it does mean we leak in the re-encode case, it
doesn't matter, since we are relying on program exit to free
the memory anyway.
Signed-off-by: Jeff King <peff@peff.net>
---
This one isn't strictly necessary, but it makes it a lot more obvious
what is going on with the memory ownership of this code in the next
patch.
builtin/commit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index 38b9a9c..fbbb40f 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -962,7 +962,7 @@ static const char *read_commit_message(const char *name)
* encodings are identical.
*/
if (out == NULL)
- out = xstrdup(commit->buffer);
+ out = commit->buffer;
return out;
}
--
1.8.0.2.16.g72e2fc9
next prev parent reply other threads:[~2013-01-26 9:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-23 14:38 segmentation fault (nullpointer) with git log --submodule -p Armin
2013-01-23 20:02 ` Jeff King
2013-01-24 12:11 ` Stefan Näwe
2013-01-24 13:40 ` Duy Nguyen
2013-01-24 14:06 ` Stefan Näwe
2013-01-24 14:14 ` Duy Nguyen
2013-01-24 23:27 ` Jeff King
2013-01-24 23:56 ` Junio C Hamano
2013-01-25 0:55 ` Jeff King
2013-01-25 2:05 ` Duy Nguyen
2013-01-25 3:59 ` Junio C Hamano
2013-01-25 4:08 ` Jeff King
2013-01-25 4:21 ` Junio C Hamano
2013-01-25 5:53 ` Jonathan Nieder
2013-01-25 7:27 ` Junio C Hamano
2013-01-25 7:32 ` Jonathon Mah
2013-01-25 15:36 ` Junio C Hamano
2013-01-26 9:40 ` [PATCH 0/3] lazily load commit->buffer Jeff King
2013-01-26 9:42 ` Jeff King [this message]
2013-01-26 9:44 ` [PATCH 2/3] logmsg_reencode: never return NULL Jeff King
2013-01-26 9:44 ` [PATCH 3/3] logmsg_reencode: lazily load missing commit buffers Jeff King
2013-01-26 21:26 ` [PATCH 0/3] lazily load commit->buffer Junio C Hamano
2013-01-26 22:14 ` Jeff King
2013-01-27 5:32 ` 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=20130126094236.GA6999@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jmah@me.com \
--cc=jrnieder@gmail.com \
--cc=netzverweigerer@gmail.com \
--cc=pclouds@gmail.com \
--cc=stefan.naewe@atlas-elektronik.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).