From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 4/6] index-pack: drop fixed-size buffer for pack filenames
Date: Wed, 15 Mar 2017 17:28:56 -0400 [thread overview]
Message-ID: <20170315212856.fetjp5cyu4l6juc7@sigill.intra.peff.net> (raw)
In-Reply-To: <20170315212617.6x57bvltinuozv4q@sigill.intra.peff.net>
We write the name of the pack filename into a fixed-size
buffer using snprintf(), but do not check the return value.
As a result, a very long object directory could cause us to
quietly truncate the pack filename (leading to a corrupted
repository, as the packfile would be missing its .pack
extension).
We can use odb_pack_name() to fix this (and make the code
simpler, too).
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/index-pack.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 187c0550c..b6e7ac331 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1384,13 +1384,9 @@ static void finalize_file(const char *final_name, const char *curr_name,
unsigned char *sha1, const char *ext)
{
if (final_name != curr_name) {
- char name[PATH_MAX];
- if (!final_name) {
- snprintf(name, sizeof(name), "%s/pack/pack-%s.%s",
- get_object_directory(), sha1_to_hex(sha1),
- ext);
- final_name = name;
- }
+ struct strbuf buf = STRBUF_INIT;
+ if (!final_name)
+ final_name = odb_pack_name(&buf, sha1, ext);
if (finalize_object_file(curr_name, final_name))
die(_("cannot store %s file"), ext);
} else if (from_stdin)
--
2.12.0.613.g6e7c52a0d
next prev parent reply other threads:[~2017-03-15 21:36 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-15 21:26 [PATCH 0/6] minor pack-name cleanups Jeff King
2017-03-15 21:27 ` [PATCH 1/6] index-pack: factor out pack/idx finalization Jeff King
2017-03-15 22:03 ` Ramsay Jones
2017-03-15 22:22 ` Jeff King
2017-03-15 22:30 ` Jeff King
2017-03-15 21:27 ` [PATCH 2/6] move odb_* declarations out of git-compat-util.h Jeff King
2017-03-15 21:28 ` [PATCH 3/6] sha1_file.c: make pack-name helper globally accessible Jeff King
2017-03-15 21:28 ` Jeff King [this message]
2017-03-15 21:29 ` [PATCH 5/6] fast-import: replace fixed buffer with odb_pack_name Jeff King
2017-03-15 21:30 ` [PATCH 6/6] odb_pack_keep(): stop generating keepfile name Jeff King
2017-03-16 1:24 ` Junio C Hamano
2017-03-16 14:26 ` [PATCH v2 0/5] minor pack-name cleanups Jeff King
2017-03-16 14:27 ` [PATCH v2 1/5] move odb_* declarations out of git-compat-util.h Jeff King
2017-03-16 14:27 ` [PATCH v2 2/5] sha1_file.c: make pack-name helper globally accessible Jeff King
2017-03-16 14:31 ` Jeff King
2017-03-16 17:03 ` Ramsay Jones
2017-03-16 17:40 ` Jeff King
2017-03-16 14:27 ` [PATCH v2 3/5] odb_pack_keep(): stop generating keepfile name Jeff King
2017-03-16 14:27 ` [PATCH v2 4/5] replace snprintf with odb_pack_name() Jeff King
2017-03-16 15:37 ` Ramsay Jones
2017-03-16 18:33 ` Junio C Hamano
2017-03-16 18:34 ` Jeff King
2017-03-16 18:57 ` Junio C Hamano
2017-03-16 14:27 ` [PATCH v2 5/5] index-pack: make pointer-alias fallbacks safer Jeff King
2017-03-16 15:42 ` Ramsay Jones
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=20170315212856.fetjp5cyu4l6juc7@sigill.intra.peff.net \
--to=peff@peff.net \
--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).