BUG: [ 1449947 ] Looks like diffutils bug for mac-style

 BUG: [ 1449949 ] crash comparing two simple test mac files
 Fix looping which missed mac case
  diffutils\src: IO.C

diff --git a/Src/Changes.txt b/Src/Changes.txt
index ee550a8..e36bbbb 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -2,6 +2,12 @@ Src\Changes.txt
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-03-14 Perry
+ BUG: [ 1449947 ] Looks like diffutils bug for mac-style
+ BUG: [ 1449949 ] crash comparing two simple test mac files
+ Fix looping which missed mac case
+  diffutils\src: IO.C
+
 2006-03-15 Kimmo
  PATCH: [ 1449868 ] Fix difference counts
   Src: DiffWrapper.cpp

diff --git a/Src/diffutils/src/IO.C b/Src/diffutils/src/IO.C
index 0318f14..59be820 100644 (file)
--- a/Src/diffutils/src/IO.C
+++ b/Src/diffutils/src/IO.C
@@ -281,7 +281,7 @@ find_and_hash_each_line (current)
              }
          else if (ignore_space_change_flag)
            /* Note that \r must be hashed (if !ignore_eol_diff) */
-           while ((c = *p++) != '\n')
+           while ((c = *p++) != '\n' && (c != '\r' || *p == '\n'))
              {
                if (ignore_eol_diff && (c=='\r' || c=='\n'))
                  continue;
@@ -342,7 +342,7 @@ find_and_hash_each_line (current)
              }
          else if (ignore_space_change_flag)
            /* Note that \r must be hashed (if !ignore_eol_diff) */
-           while ((c = *p++) != '\n')
+           while ((c = *p++) != '\n' && (c != '\r' || *p == '\n'))
              {
                if (ignore_eol_diff && (c=='\r' || c=='\n'))
                  continue;