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>
This commit is contained in:
parent
06ca0f45a0
commit
aa4b78d483
2
pretty.c
2
pretty.c
@ -1267,6 +1267,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
|
|||||||
if (c->signature_check.key)
|
if (c->signature_check.key)
|
||||||
strbuf_addstr(sb, c->signature_check.key);
|
strbuf_addstr(sb, c->signature_check.key);
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
return 2;
|
return 2;
|
||||||
}
|
}
|
||||||
|
@ -147,4 +147,10 @@ test_expect_success GPG 'show lack of signature with custom format' '
|
|||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'unused %G placeholders are passed through' '
|
||||||
|
echo "%GX %G" >expect &&
|
||||||
|
git log -1 --format="%GX %G" >actual &&
|
||||||
|
test_cmp expect actual
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
Loading…
Reference in New Issue
Block a user