paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 03:39:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Prevent an infinite loop when comparing files. Issue #38185, patch from Domingo Galmés.

Browse Source 
git-svn-id: trunk@64199 -
This commit is contained in:
juha 2020-12-12 18:45:29 +00:00
parent 5d01307132
commit 473e65ba01
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ide/diffpatch.pas
View File

@ -616,6 +616,8 @@ begin
// chomp empty lines at end // chomp empty lines at end
fPart1.GetPrevLineExtends(Cur1); fPart1.GetPrevLineExtends(Cur1);
fPart2.GetPrevLineExtends(Cur2); fPart2.GetPrevLineExtends(Cur2);
if (Cur1.LineNumber < 1) or (Cur2.LineNumber < 1) then
break;
until not LinesAreEqual(Cur1,Cur2); until not LinesAreEqual(Cur1,Cur2);
end; end;
end; end;