mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
"git fmt-merge-msg" SIGSEGV
Ok, this is a _really_ stupid case, and I don't think it matters, but hey, we should never SIGSEGV. Steps to reproduce: mkdir duh cd duh git init-db git-fmt-merge-msg < /dev/null will cause a SIGSEGV in cmd_fmt_merge_msg(), because we're doing a strncmp() with a NULL current_branch. And yeah, it's an insane schenario, and no, it doesn't really matter. The only reason I noticed was that a broken version of my "git pull" into an empty directory would cause this. This silly patch just replaces the SIGSEGV with a controlled exit with an error message. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
d09e79cb1c
commit
6b1f8c32b1
|
@ -278,6 +278,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
|
||||||
|
|
||||||
/* get current branch */
|
/* get current branch */
|
||||||
current_branch = resolve_ref("HEAD", head_sha1, 1, NULL);
|
current_branch = resolve_ref("HEAD", head_sha1, 1, NULL);
|
||||||
|
if (!current_branch)
|
||||||
|
die("No current branch");
|
||||||
if (!strncmp(current_branch, "refs/heads/", 11))
|
if (!strncmp(current_branch, "refs/heads/", 11))
|
||||||
current_branch += 11;
|
current_branch += 11;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue