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>
Nguyễn Thái Ngọc Duy committed
Dec 15, 2011 at 20:47 UTC
37576c14439a4dfa43bec5a5c953fea1cc436bbf
2 files changed
+9
commit.c
+3
@@ -855,6 +855,9 @@ int commit_tree(const struct strbuf *msg, unsigned char *tree,
855
856
assert_sha1_type(tree, OBJ_TREE);
857
858
+ if (memchr(msg->buf, '\0', msg->len))
859
+ return error("a NUL byte in commit log message not allowed.");
860
+
861
/* Not having i18n.commitencoding is the same as having utf-8 */
862
encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
863
t/t3900-i18n-commit.sh
+6
@@ -34,6 +34,12 @@ test_expect_success 'no encoding header for base case' '
34
test z = "z$E"
35
'
36
37
+test_expect_failure 'UTF-16 refused because of NULs' '
38
+ echo UTF-16 >F &&
39
+ git commit -a -F "$TEST_DIRECTORY"/t3900/UTF-16.txt
40
+'
41
+
42
+
43
for H in ISO8859-1 eucJP ISO-2022-JP
44
do
45
test_expect_success "$H setup" '