git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Michael J Gruber <git@drmicha.warpmail.net>
Subject: [PATCH] pretty: avoid reading past end-of-string with "%G"
Date: Mon, 16 Jun 2014 16:13:11 -0400	[thread overview]
Message-ID: <20140616201311.GA26829@sigill.intra.peff.net> (raw)

If the user asks for --format=%G with nothing else, we
correctly realize that "%G" is not a valid placeholder (it
should be "%G?", "%GK", etc). But we still tell the
strbuf_expand code that we consumed 2 characters, causing it
to jump over the trailing NUL and output garbage.

This also fixes the case where "%GX" would be consumed (and
produce no output). In other cases, we pass unrecognized
placeholders through to the final string.

Signed-off-by: Jeff King <peff@peff.net>
---
Noticed while experimenting with "%G" placeholders in the nearby thread.

It doesn't look like we have any tests of "%G*" and friends at all. :(

 pretty.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pretty.c b/pretty.c
index e1e2cad..70d8776 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1267,6 +1267,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 			if (c->signature_check.key)
 				strbuf_addstr(sb, c->signature_check.key);
 			break;
+		default:
+			return 0;
 		}
 		return 2;
 	}
-- 
2.0.0.566.gfe3e6b2

             reply	other threads:[~2014-06-16 20:13 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-16 20:13 Jeff King [this message]
2014-06-16 20:26 ` [PATCH] t7510: check %G* pretty-format output Jeff King
2014-06-16 21:50   ` Eric Sunshine
2014-06-16 23:36     ` Jeff King
2014-06-16 23:59       ` [PATCH 0/5] --format=%G tests and fixes Jeff King
2014-06-16 23:59         ` [PATCH 1/5] t7510: stop referring to master in later tests Jeff King
2014-06-17  0:03         ` [PATCH 2/5] t7510: use consistent &&-chains in loop Jeff King
2014-06-17  0:05         ` [PATCH 3/5] t7510: test a commit signed by an unknown key Jeff King
2014-06-17  0:06         ` [PATCH 4/5] t7510: check %G* pretty-format output Jeff King
2014-06-17  0:07         ` [PATCH 5/5] pretty: avoid reading past end-of-string with "%G" 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

  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=20140616201311.GA26829@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
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).