Commit 8d0fe45ad75f58cd5f797f72f4b621bab1282fdb
2019-08-12T11:31:27
fix crashes in tog when blame returns no results on a file fix for underlying blame bug still pending...
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
diff --git a/tog/tog.c b/tog/tog.c
index 9203e20..9ff3553 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -1542,12 +1542,11 @@ browse_commit_tree(struct tog_view **new_view, int begin_x,
/* Walk the path and open corresponding tree objects. */
p = path;
+ while (p[0] == '/')
+ p++;
while (*p) {
struct got_object_id *tree_id;
- while (p[0] == '/')
- p++;
-
/* Ensure the correct subtree entry is selected. */
slash = strchr(p, '/');
if (slash == NULL)
@@ -3007,21 +3006,26 @@ draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
if (view->focussed && nprinted == selected_line - 1)
wstandout(view->window);
- blame_line = &lines[lineno - 1];
- if (blame_line->annotated && prev_id &&
- got_object_id_cmp(prev_id, blame_line->id) == 0)
- waddstr(view->window, " ");
- else if (blame_line->annotated) {
- char *id_str;
- err = got_object_id_str(&id_str, blame_line->id);
- if (err) {
- free(line);
- free(wline);
- return err;
+ if (nlines > 0) {
+ blame_line = &lines[lineno - 1];
+ if (blame_line->annotated && prev_id &&
+ got_object_id_cmp(prev_id, blame_line->id) == 0)
+ waddstr(view->window, " ");
+ else if (blame_line->annotated) {
+ char *id_str;
+ err = got_object_id_str(&id_str, blame_line->id);
+ if (err) {
+ free(line);
+ free(wline);
+ return err;
+ }
+ wprintw(view->window, "%.8s ", id_str);
+ free(id_str);
+ prev_id = blame_line->id;
+ } else {
+ waddstr(view->window, "........ ");
+ prev_id = NULL;
}
- wprintw(view->window, "%.8s ", id_str);
- free(id_str);
- prev_id = blame_line->id;
} else {
waddstr(view->window, "........ ");
prev_id = NULL;
@@ -3116,11 +3120,14 @@ blame_thread(void *arg)
}
static struct got_object_id *
-get_selected_commit_id(struct tog_blame_line *lines, int first_displayed_line,
- int selected_line)
+get_selected_commit_id(struct tog_blame_line *lines, int nlines,
+ int first_displayed_line, int selected_line)
{
struct tog_blame_line *line;
+ if (nlines <= 0)
+ return NULL;
+
line = &lines[first_displayed_line - 1 + selected_line - 1];
if (!line->annotated)
return NULL;
@@ -3465,7 +3472,7 @@ input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
case 'b':
case 'p': {
struct got_object_id *id = NULL;
- id = get_selected_commit_id(s->blame.lines,
+ id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
s->first_displayed_line, s->selected_line);
if (id == NULL)
break;
@@ -3555,7 +3562,7 @@ input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
struct got_object_id *id = NULL;
struct got_object_qid *pid;
struct got_commit_object *commit = NULL;
- id = get_selected_commit_id(s->blame.lines,
+ id = get_selected_commit_id(s->blame.lines, s->blame.nlines,
s->first_displayed_line, s->selected_line);
if (id == NULL)
break;
@@ -4070,6 +4077,7 @@ open_tree_view(struct tog_view *view, struct got_tree_object *root,
s->root = s->tree = root;
s->entries = got_object_tree_get_entries(root);
s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
+ s->selected_entry = SIMPLEQ_FIRST(&s->entries->head);
s->commit_id = got_object_id_dup(commit_id);
if (s->commit_id == NULL) {
err = got_error_from_errno("got_object_id_dup");