wt-status: avoid building bogus branch name with detached HEAD

If we're on a detached HEAD then wt_shortstatus_print_tracking() takes
the string "HEAD (no branch)", translates it, skips the first eleven
characters and passes the result to branch_get(), which returns a bogus
result and accesses memory out of bounds in order to produce it.
Somehow stat_tracking_info(), which is passed that result, does the
right thing anyway, i.e. it finds that there is no base.

Avoid the bogus results and memory accesses by checking for HEAD first
and exiting early in that case.  This fixes t7060 with --valgrind.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index 879d0c169d6ca2f608c75fd10b5414c9abb3005c..58df3f3bb1abec98ce28cacab01237cd80964736 100755 (executable)
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -213,7 +213,7 @@ EOF
        git checkout master
 '
 
        git checkout master
 '
 

-test_expect_failure 'status --branch with detached HEAD' '
+test_expect_success 'status --branch with detached HEAD' '

        git reset --hard &&
        git checkout master^0 &&
        git status --branch --porcelain >actual &&
        git reset --hard &&
        git checkout master^0 &&
        git status --branch --porcelain >actual &&

diff --git a/wt-status.c b/wt-status.c
index ac05b9b73d79386dee4c5d7f9719a9a397dd4ca4..0e4a04e695f63b99d691ad38863e2a5e85a65e76 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -1521,16 +1521,19 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
                return;
        branch_name = s->branch;
 
                return;
        branch_name = s->branch;
 

+       if (s->is_initial)
+               color_fprintf(s->fp, header_color, _("Initial commit on "));
+
+       if (!strcmp(s->branch, "HEAD")) {
+               color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s",
+                             _("HEAD (no branch)"));
+               goto conclude;
+       }
+

        if (starts_with(branch_name, "refs/heads/"))
                branch_name += 11;
        if (starts_with(branch_name, "refs/heads/"))
                branch_name += 11;

-       else if (!strcmp(branch_name, "HEAD")) {
-               branch_name = _("HEAD (no branch)");
-               branch_color_local = color(WT_STATUS_NOBRANCH, s);
-       }

 
        branch = branch_get(s->branch + 11);
 
        branch = branch_get(s->branch + 11);

-       if (s->is_initial)
-               color_fprintf(s->fp, header_color, _("Initial commit on "));

 
        color_fprintf(s->fp, branch_color_local, "%s", branch_name);
 
 
        color_fprintf(s->fp, branch_color_local, "%s", branch_name);