After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 650726 - Meld chokes on file comparison
Meld chokes on file comparison
Status: RESOLVED FIXED
Product: meld
Classification: Other
Component: filediff
1.5.x
Other Linux
: Normal normal
: ---
Assigned To: Kai Willadsen
meld-maint
Depends on:
Blocks:
 
 
Reported: 2011-05-21 11:12 UTC by patspiper
Modified: 2011-05-31 10:03 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
Files that confuse meld (2.60 KB, application/zip)
2011-05-22 16:50 UTC, patspiper 		  Details
fix the endless loop when nextbit is empty (905 bytes, patch)
2011-05-27 14:28 UTC, Julian Taylor 		none Details | Review
Patch (1.19 KB, patch)
2011-05-31 08:12 UTC, Kai Willadsen 		none Details | Review

Description patspiper 2011-05-21 11:12:56 UTC 
Meld enters an infinite loop trying to compare the files below.

Ubuntu 11.04
Meld 1.5.0

Reported as well to Ubuntu Launchpad:
https://bugs.launchpad.net/ubuntu/+source/meld/+bug/786134
Comment 1 patspiper 2011-05-22 16:50:38 UTC 
Created attachment 188341 [details]
Files that confuse meld
Comment 2 Kai Willadsen 2011-05-22 20:29:47 UTC 
Thanks for taking the time to report this bug.
This particular bug has already been reported into our bug tracking system, but we are happy to tell you that the problem has already been fixed, and the fix is present in Meld 1.5.1.

*** This bug has been marked as a duplicate of bug 638314 ***
Comment 3 Julian Taylor 2011-05-27 13:27:44 UTC 
I can confirm this.
it is not fixed in 1.5.1 and git 4391ac071b6ce
The files in bug 638314 work, so this is a different issue
Comment 4 Julian Taylor 2011-05-27 13:51:24 UTC 
worse yet it affects 1.4.0 too, but not 1.3.2

it bisecting shows it was introduced in commit 17124883d91f:
Fix spurious newline when CRLF splits over boundary (closes bgo#623076)
Comment 5 Julian Taylor 2011-05-27 14:28:43 UTC 
Created attachment 188760 [details] [review]
fix the endless loop when nextbit is empty

this patch fixes the issue, but I'm unsure about all consequences.
needs review
Comment 6 Kai Willadsen 2011-05-30 07:55:56 UTC 
What platform is this on? I can't reproduce it here.
Comment 7 Julian Taylor 2011-05-30 08:23:21 UTC 
I can reproduce it on ubuntu 11.04 and debian unstable.
Comment 8 Kai Willadsen 2011-05-31 08:12:49 UTC 
Created attachment 188909 [details] [review]
Patch

Can you check whether this patch fixes the bug for you? I'm somewhat more comfortable with this change.
Comment 9 Julian Taylor 2011-05-31 08:20:21 UTC 
the patch fixes the problem for me
Comment 10 Kai Willadsen 2011-05-31 10:03:59 UTC 
Pushed to git. Thanks for your help.