[PATCH 2/6] Make xdl_hash_record_with_whitespace ignore eof
From: Thell Fowler <hidden>
Date: 2016-06-15 22:47:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
- When xdl_hash_record_with_whitespace encountered an incomplete
line the hash would be different than the identical line with
either --ignore-space-change or --ignore-space-at-eol on an
incomplete line because they only terminated with a check for
a new-line.
Signed-off-by: Thell Fowler <redacted>
---
xdiff/xutils.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 04ad468702209b77427e635370d41001986042ce..c6512a53b08a8c9039614738310aa2786f4fbb1c 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c@@ -248,12 +248,12 @@ static unsigned long xdl_hash_record_with_whitespace(char const **data, if (flags & XDF_IGNORE_WHITESPACE) ; /* already handled */ else if (flags & XDF_IGNORE_WHITESPACE_CHANGE - && ptr[1] != '\n') { + && ptr[1] != '\n' && ptr + 1 < top) { ha += (ha << 5); ha ^= (unsigned long) ' '; } else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL - && ptr[1] != '\n') { + && ptr[1] != '\n' && ptr + 1 < top) { while (ptr2 != ptr + 1) { ha += (ha << 5); ha ^= (unsigned long) *ptr2;
--
1.6.4.172.g5c0d0.dirty