BUG: [ 1209386 ] Comparing by quick differences jams WinMerge

  Src: ByteComparator.cpp

diff --git a/Src/ByteComparator.cpp b/Src/ByteComparator.cpp
index 1e87dfe..e793cf2 100644 (file)
--- a/Src/ByteComparator.cpp
+++ b/Src/ByteComparator.cpp
@@ -166,8 +166,12 @@ ByteComparator::CompareBuffers(LPCSTR &ptr0, LPCSTR &ptr1, LPCSTR end0, LPCSTR e
                                if (m_eol0 || m_eol1)
                                {
                                        if (!m_eol0 || !m_eol1)
+                                       {
+                                               // one side had an end-of-line, but the other didn't
                                                return RESULT_DIFF;
-                                       continue;
+                                       }
+                                       // otherwise, both sides had end-of-line
+                                       // pointers have already been advanced, so just continue happily
                                }
                        }
                }

diff --git a/Src/readme.txt b/Src/readme.txt
index 358d1cb..04b1a65 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -2,6 +2,8 @@
  PATCH: [ 1206727 ] decouple codepage module from options files
   Src: codepage.cpp codepage.h MainFrm.cpp MainFrm.h
   Src/Common: LanguageSelect.cpp
+ BUG: [ 1209386 ] Comparing by quick differences jams WinMerge
+  Src: ByteComparator.cpp
 
 2005-05-27 Kimmo
  PATCH: [ 1209294 ] Remove running stampver-tool post-build