Merge from origin/emacs-24

[gnu-emacs] / src / search.c

diff --git a/src/search.c b/src/search.c
index e9617985c18e593128f8ab49b0a42aaf0ac42ea5..5da99c408a5f2d8327e5c35e5405024a531ad644 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -706,6 +706,12 @@ find_newline (ptrdiff_t start, ptrdiff_t start_byte, ptrdiff_t end,
                                               start, &next_change);
                if (result)
                  {
+                   /* When the cache revalidation is deferred,
+                      next-change might point beyond ZV, which will
+                      cause assertion violation in CHAR_TO_BYTE below.
+                      Limit next_change to ZV to avoid that.  */
+                   if (next_change > ZV)
+                     next_change = ZV;
                    start = next_change;
                    lim1 = next_change = end;
                  }