diff options
| author | Taras Madan <tarasmadan@google.com> | 2024-08-23 12:42:22 +0200 |
|---|---|---|
| committer | Taras Madan <tarasmadan@google.com> | 2024-08-23 10:53:54 +0000 |
| commit | d7d323527f8e6073ec1da024a08c26f50626254f (patch) | |
| tree | 1a95e86b63407840ab226290c209a3d7692d46c8 /pkg/covermerger/lines_matcher.go | |
| parent | ce8a9099a5364313c309ba882f76c9ab4d74afb1 (diff) | |
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.
Diffstat (limited to 'pkg/covermerger/lines_matcher.go')
| -rw-r--r-- | pkg/covermerger/lines_matcher.go | 1 |
1 files changed, 1 insertions, 0 deletions
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{} |