From d7d323527f8e6073ec1da024a08c26f50626254f Mon Sep 17 00:00:00 2001 From: Taras Madan Date: Fri, 23 Aug 2024 12:42:22 +0200 Subject: pkg/covermerger: never give up diffing the files It hopefully fixes https://github.com/google/syzkaller/issues/4815. The default 1 second timeout is not what we want. To reproduce the problem, set timeout to 10 ms. --- pkg/covermerger/lines_matcher.go | 1 + 1 file changed, 1 insertion(+) (limited to 'pkg') diff --git a/pkg/covermerger/lines_matcher.go b/pkg/covermerger/lines_matcher.go index b54c049f0..0f3d33fc7 100644 --- a/pkg/covermerger/lines_matcher.go +++ b/pkg/covermerger/lines_matcher.go @@ -11,6 +11,7 @@ import ( func makeLineToLineMatcher(textFrom, textTo string) *LineToLineMatcher { diffMatcher := dmp.New() + diffMatcher.DiffTimeout = 0 diffs := diffMatcher.DiffMain(textFrom, textTo, false) curToLinePos := 0 textDestPosToLine := map[int]int{} -- cgit mrf-deployment