mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/war-on-nul-in-commit'

Browse Source 
* nd/war-on-nul-in-commit:
  commit_tree(): refuse commit messages that contain NULs
  Convert commit_tree() to take strbuf as message
  merge: abort if fails to commit

Conflicts:
	builtin/commit.c
	commit.c
	commit.h
This commit is contained in:
Junio C Hamano
2011-12-22 11:27:26 -08:00
parent 52b9d2cf7f 37576c1443
commit f35ccd9be2
10 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
commit.c
View File

@ -973,7 +973,7 @@ void free_commit_extra_headers(struct commit_extra_header *extra)
}
}
int commit_tree(const char *msg, unsigned char *tree,
int commit_tree(const struct strbuf *msg, unsigned char *tree,
struct commit_list *parents, unsigned char *ret,
const char *author)
{
@ -991,7 +991,7 @@ static const char commit_utf8_warn[] =
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n";
int commit_tree_extended(const char *msg, unsigned char *tree,
int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
struct commit_list *parents, unsigned char *ret,
const char *author, struct commit_extra_header *extra)
{
@ -1001,6 +1001,9 @@ int commit_tree_extended(const char *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);
@ -1037,7 +1040,7 @@ int commit_tree_extended(const char *msg, unsigned char *tree,
strbuf_addch(&buffer, '\n');
/* And add the comment */
strbuf_addstr(&buffer, msg);
strbuf_addbuf(&buffer, msg);
/* And check the encoding */
if (encoding_is_utf8 && !is_utf8(buffer.buf))