Merge pull request libgit2#5783 from lhchavez/mwindow-coverity

ethomson · web-flow · commit 41ccbc048ce8 · 2021-02-01T09:41:16.000Z
mwindow: Fix a bug in the LRU window finding code
diff --git a/src/mwindow.c b/src/mwindow.c
@@ -312,8 +312,10 @@ static int git_mwindow_find_lru_file_locked(git_mwindow_file **out)
 				current_file, &mru_window, NULL, true, GIT_MWINDOW__MRU)) {
 			continue;
 		}
-		if (!lru_window || lru_window->last_used > mru_window->last_used)
+		if (!lru_window || lru_window->last_used > mru_window->last_used) {
+			lru_window = mru_window;
 			lru_file = current_file;
+		}
 	}
 
 	if (!lru_file) {

Original file line number	Diff line number	Diff line change
`@@ -312,8 +312,10 @@ static int git_mwindow_find_lru_file_locked(git_mwindow_file **out)`
`312`	`312`	`current_file, &mru_window, NULL, true, GIT_MWINDOW__MRU)) {`
`313`	`313`	`continue;`
`314`	`314`	`}`
`315`		`- if (!lru_window \|\| lru_window->last_used > mru_window->last_used)`
	`315`	`+ if (!lru_window \|\| lru_window->last_used > mru_window->last_used) {`
	`316`	`+ lru_window = mru_window;`
`316`	`317`	`lru_file = current_file;`
	`318`	`+ }`
`317`	`319`	`}`
`318`	`320`
`319`	`321`	`if (!lru_file) {`