Summary: | Kompare hangs when opening patch file | ||
---|---|---|---|
Product: | [Applications] kompare | Reporter: | Tommi Rantala <tommi.rantala> |
Component: | general | Assignee: | Kompare developers <kompare-devel> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | esigra |
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | Compiled Sources | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: | ||
Attachments: |
patch file that triggers the hang
much smaller file that also hangs |
Description
Tommi Rantala
2005-06-15 19:50:11 UTC
Created attachment 11467 [details]
patch file that triggers the hang
Created attachment 11501 [details]
much smaller file that also hangs
Here's a much smaller edited version of the original patch that still triggers
the hang.
This is a confirmation that the bug still exists in Kompare 3.4 (KDE 3.5.10). SVN commit 926225 by bruggie: BUG: 107489 Fix infinite recursion when not having a common root folder in a multi-file diff which happens frequently. M +11 -0 komparenavtreepart.cpp WebSVN link: http://websvn.kde.org/?view=rev&revision=926225 SVN commit 928150 by kkofler: Mass backport of Kompare bugfixes for KDE 4.2.1 (should not touch any translatable strings): backport revisions 913308, 913309, 922431 (Kompare only), 924527, 924539, 924540, 924880, 924959, 924960, 925266, 926028, 926131, 926143, 926225, 928082 (minus i18n string changes), 928141, 928146 from trunk. CCBUG: 176804 CCBUG: 169692 CCBUG: 182792 CCBUG: 176797 CCBUG: 175251 CCBUG: 75794 CCBUG: 89781 CCBUG: 145956 CCBUG: 107489 CCBUG: 165421 CCBUG: 174924 CCBUG: 103651 CCBUG: 102800 CCMAIL: bruggie@gmail.com Bump Kompare version from 3.5.2 to 3.5.3 (trunk is 4.0.0). Tested on Fedora 9 i386, KDE 4.2.0. Note: skipped revision 926198 because it introduces a string and #124121 is more a user error than a bug anyway. M +34 -30 kompare_shell.cpp M +18 -3 komparenavtreepart/komparenavtreepart.cpp M +15 -12 komparepart/kompare_part.cpp M +2 -2 komparepart/kompare_part.h M +9 -6 komparepart/kompareconnectwidget.cpp M +80 -31 komparepart/komparelistview.cpp M +26 -5 komparepart/komparelistview.h M +2 -2 komparepart/kompareprefdlg.cpp M +4 -1 komparepart/kompareprefdlg.h M +1 -1 komparepart/komparesplitter.cpp M +2 -1 libdialogpages/diffpage.cpp M +4 -3 libdialogpages/diffpage.h M +14 -4 libdialogpages/filespage.cpp M +4 -4 libdialogpages/filespage.h M +10 -8 libdiff2/difference.cpp M +5 -2 libdiff2/difference.h M +2 -1 libdiff2/diffhunk.cpp M +2 -2 libdiff2/diffhunk.h M +5 -30 libdiff2/diffmodel.cpp M +3 -6 libdiff2/diffmodel.h M +1 -1 libdiff2/diffmodellist.cpp M +4 -2 libdiff2/diffmodellist.h M +34 -31 libdiff2/komparemodellist.cpp M +3 -1 libdiff2/komparemodellist.h M +2 -1 libdiff2/kompareprocess.cpp M +53 -17 libdiff2/levenshteintable.cpp M +5 -1 libdiff2/parserbase.cpp M +21 -26 main.cpp WebSVN link: http://websvn.kde.org/?view=rev&revision=928150 The 2 attached files no longer hang Kompare 4.0.0 (KDE 4.3.3). Thanks for fixing! |