commit 78eecffc27a77c02d95f8ab9dffb7d8ec7dba733
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Thu Jun 23 14:09:35 2022 UTC

tog: fix crash in expand_tab while searching in diff/blame views

found by op@

ok op@ tracey@

commit - cbea38000971f273e45bd6c97b6203daefbb8438
commit + 78eecffc27a77c02d95f8ab9dffb7d8ec7dba733
blob - 4194680bb27fb1c782f6ccbcef7f822f84076cd0
blob + 39feae5e961f4c715e6113fd560171ffad07d234
--- tog/tog.c
+++ tog/tog.c
@@ -3726,7 +3726,7 @@ search_next_diff_view(struct tog_view *view)
 	struct tog_diff_view_state *s = &view->state.diff;
 	const struct got_error *err = NULL;
 	int lineno;
-	char *exstr = NULL, *line = NULL;
+	char *line = NULL;
 	size_t linesize = 0;
 	ssize_t linelen;
 
@@ -3764,24 +3764,26 @@ search_next_diff_view(struct tog_view *view)
 			return got_error_from_errno("fseeko");
 		}
 		linelen = getline(&line, &linesize, s->f);
-		err = expand_tab(&exstr, line);
-		if (err)
-			break;
-		if (linelen != -1 &&
-		    match_line(exstr, &view->regex, 1, &view->regmatch)) {
-			view->search_next_done = TOG_SEARCH_HAVE_MORE;
-			s->matched_line = lineno;
-			break;
+		if (linelen != -1) {
+			char *exstr;
+			err = expand_tab(&exstr, line);
+			if (err)
+				break;
+			if (match_line(exstr, &view->regex, 1,
+			    &view->regmatch)) {
+				view->search_next_done = TOG_SEARCH_HAVE_MORE;
+				s->matched_line = lineno;
+				free(exstr);
+				break;
+			}
+			free(exstr);
 		}
-		free(exstr);
-		exstr = NULL;
 		if (view->searching == TOG_SEARCH_FORWARD)
 			lineno++;
 		else
 			lineno--;
 	}
 	free(line);
-	free(exstr);
 
 	if (s->matched_line) {
 		s->first_displayed_line = s->matched_line;
@@ -4853,7 +4855,7 @@ search_next_blame_view(struct tog_view *view)
 	struct tog_blame_view_state *s = &view->state.blame;
 	const struct got_error *err = NULL;
 	int lineno;
-	char *exstr = NULL, *line = NULL;
+	char *line = NULL;
 	size_t linesize = 0;
 	ssize_t linelen;
 
@@ -4891,24 +4893,26 @@ search_next_blame_view(struct tog_view *view)
 			return got_error_from_errno("fseeko");
 		}
 		linelen = getline(&line, &linesize, s->blame.f);
-		err = expand_tab(&exstr, line);
-		if (err)
-			break;
-		if (linelen != -1 &&
-		    match_line(exstr, &view->regex, 1, &view->regmatch)) {
-			view->search_next_done = TOG_SEARCH_HAVE_MORE;
-			s->matched_line = lineno;
-			break;
+		if (linelen != -1) {
+			char *exstr;
+			err = expand_tab(&exstr, line);
+			if (err)
+				break;
+			if (match_line(exstr, &view->regex, 1,
+			    &view->regmatch)) {
+				view->search_next_done = TOG_SEARCH_HAVE_MORE;
+				s->matched_line = lineno;
+				free(exstr);
+				break;
+			}
+			free(exstr);
 		}
-		free(exstr);
-		exstr = NULL;
 		if (view->searching == TOG_SEARCH_FORWARD)
 			lineno++;
 		else
 			lineno--;
 	}
 	free(line);
-	free(exstr);
 
 	if (s->matched_line) {
 		s->first_displayed_line = s->matched_line;