diff options
author | Jeff King <peff@peff.net> | 2014-06-16 20:07:07 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-17 13:41:41 -0700 |
commit | aa4b78d483a918ebee810993e420b4697b0de4d3 (patch) | |
tree | 906dc9439e162ce18b6bdb5e67c0076b408f14a3 /resolve-undo.h | |
parent | t7510: check %G* pretty-format output (diff) | |
download | tgif-aa4b78d483a918ebee810993e420b4697b0de4d3.tar.xz |
pretty: avoid reading past end-of-string with "%G"
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions