From: Jeff King <peff@peff.net>
To: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
Cc: git discussion list <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] archive-tar: fix sanity check in config parsing
Date: Sun, 13 Jan 2013 15:00:49 -0500 [thread overview]
Message-ID: <20130113200044.GA3979@sigill.intra.peff.net> (raw)
In-Reply-To: <50F2F1E9.1040700@lsrfire.ath.cx>
On Sun, Jan 13, 2013 at 06:42:01PM +0100, René Scharfe wrote:
> When parsing these config variable names, we currently check that
> the second dot is found nine characters into the name, disallowing
> filter names with a length of five characters. Additionally,
> git archive crashes when the second dot is omitted:
>
> $ ./git -c tar.foo=bar archive HEAD >/dev/null
> fatal: Data too large to fit into virtual memory space.
>
> Instead we should check if the second dot exists at all, or if
> we only found the first one.
Eek. Thanks for finding it. Your fix is obviously correct.
> --- a/archive-tar.c
> +++ b/archive-tar.c
> @@ -335,7 +335,7 @@ static int tar_filter_config(const char *var, const char *value, void *data)
> if (prefixcmp(var, "tar."))
> return 0;
> dot = strrchr(var, '.');
> - if (dot == var + 9)
> + if (dot == var + 3)
> return 0;
For the curious, the original version of the patch[1] read:
+ if (prefixcmp(var, "tarfilter."))
+ return 0;
+ dot = strrchr(var, '.');
+ if (dot == var + 9)
+ return 0;
and when I shortened the config section to "tar" in a re-roll of the
series, I missed the corresponding change to the offset.
-Peff
[1] http://thread.gmane.org/gmane.comp.version-control.git/175785/focus=175858
next prev parent reply other threads:[~2013-01-13 20:01 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-13 17:42 [PATCH] archive-tar: fix sanity check in config parsing René Scharfe
2013-01-13 20:00 ` Jeff King [this message]
2013-01-14 8:17 ` Joachim Schmitz
2013-01-14 12:44 ` Jeff King
2013-01-14 14:58 ` Jeff King
2013-01-14 15:00 ` [PATCH 1/6] config: add helper function for parsing key names Jeff King
2013-01-14 18:08 ` Junio C Hamano
2013-01-15 16:04 ` Jeff King
2013-01-15 17:07 ` Junio C Hamano
2013-01-18 20:53 ` Junio C Hamano
2013-01-23 6:21 ` [PATCHv2 0/8] config key-parsing cleanups Jeff King
2013-01-23 6:23 ` [PATCHv2 1/8] config: add helper function for parsing key names Jeff King
2013-01-23 6:23 ` [PATCHv2 2/8] archive-tar: use parse_config_key when parsing config Jeff King
2013-01-23 6:24 ` [PATCHv2 3/8] convert some config callbacks to parse_config_key Jeff King
2013-01-23 6:25 ` [PATCHv2 4/8] userdiff: drop parse_driver function Jeff King
2013-01-23 6:25 ` [PATCHv2 5/8] submodule: use parse_config_key when parsing config Jeff King
2013-01-23 20:45 ` Jens Lehmann
2013-01-23 6:26 ` [PATCHv2 6/8] submodule: simplify memory handling in config parsing Jeff King
2013-01-23 20:51 ` Jens Lehmann
2013-01-23 6:27 ` [PATCHv2 7/8] help: use parse_config_key for man config Jeff King
2013-01-23 6:27 ` [PATCHv2 8/8] reflog: use parse_config_key in config callback Jeff King
2013-01-23 7:04 ` Junio C Hamano
2013-01-23 7:27 ` [PATCHv2 0/8] config key-parsing cleanups Jonathan Nieder
2013-01-14 15:02 ` [PATCH 2/6] archive-tar: use match_config_key when parsing config Jeff King
2013-01-14 15:03 ` [PATCH 3/6] convert some config callbacks to match_config_key Jeff King
2013-01-14 16:55 ` Jonathan Nieder
2013-01-14 17:06 ` Jeff King
2013-01-14 18:05 ` Jeff King
2013-01-14 15:04 ` [PATCH 4/6] userdiff: drop parse_driver function Jeff King
2013-01-14 15:04 ` [PATCH 5/6] submodule: use match_config_key when parsing config Jeff King
2013-01-14 15:07 ` [PATCH 6/6] submodule: simplify memory handling in config parsing 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130113200044.GA3979@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rene.scharfe@lsrfire.ath.cx \
/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).