Commit Diff

Commit:
1fddf795d370eab80e6b2a3e502a6e7e89c9e963
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
fix 'tog blame' segfault upon empty input file; reported by + ok naddy
Actions:
Patch | Tree
commit - d51387a0c213a0d133580b7cf37bca8f7e8569f3
commit + 1fddf795d370eab80e6b2a3e502a6e7e89c9e963
blob - b39c45d7a3b0afb03d2aa58d8de523c49e7e800a
blob + 767893aa64eee3688b73721fe03b7b54ae2f99a8
--- tog/tog.c
+++ tog/tog.c
@@ -4237,8 +4237,12 @@ run_blame(struct tog_view *view)
 	}
 	err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
 	    &blame->line_offsets, blame->f, blob);
-	if (err || blame->nlines == 0)
+	if (err)
+		goto done;
+	if (blame->nlines == 0) {
+		s->blame_complete = 1;
 		goto done;
+	}
 
 	/* Don't include \n at EOF in the blame line count. */
 	if (blame->line_offsets[blame->nlines - 1] == blame->filesize)
@@ -4438,7 +4442,7 @@ show_blame_view(struct tog_view *view)
 	struct tog_blame_view_state *s = &view->state.blame;
 	int errcode;
 
-	if (s->blame.thread == NULL) {
+	if (s->blame.thread == NULL && !s->blame_complete) {
 		errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
 		    &s->blame.thread_args);
 		if (errcode)