mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-23 09:06:35 +02:00
Code

commit_tree(): refuse commit messages that contain NULs 

Current implementation sees NUL as terminator. If users give a message
with NUL byte in it (e.g. editor set to save as UTF-16), the new commit
message will have NULs. However following operations (displaying or
amending a commit for example) will not keep anything after the first NUL.

Stop user right when they do this. If NUL is added by mistake, they have
their chance to fix. Otherwise, log messages will no longer be text "git
log" and friends would grok.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2011-12-15 20:47:23 +07:00 committed by Junio C Hamano
parent 13f8b72d8c
commit 37576c1443
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
commit.c
View File

@ -855,6 +855,9 @@ int commit_tree(const struct strbuf *msg, unsigned char *tree,
assert_sha1_type(tree, OBJ_TREE);
if (memchr(msg->buf, '\0', msg->len))
return error("a NUL byte in commit log message not allowed.");
/* Not having i18n.commitencoding is the same as having utf-8 */
encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);

6
t/t3900-i18n-commit.sh
View File

@ -34,6 +34,12 @@ test_expect_success 'no encoding header for base case' '
test z = "z$E"
'
test_expect_failure 'UTF-16 refused because of NULs' '
echo UTF-16 >F &&
git commit -a -F "$TEST_DIRECTORY"/t3900/UTF-16.txt
'
for H in ISO8859-1 eucJP ISO-2022-JP
do
test_expect_success "$H setup" '