XEmacs 21.2.9

[chise/xemacs-chise.git.1] / src / search.c

diff --git a/src/search.c b/src/search.c
index cb66c4f..051fded 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -1963,7 +1963,7 @@ and you do not need to specify it.)
              Charcount subend   = -1;
 
              c = string_char (XSTRING (newtext), strpos);
-             if (c == '\\')
+             if (c == '\\' && strpos < stlen - 1)
                {
                  c = string_char (XSTRING (newtext), ++strpos);
                  if (c == '&')
@@ -2109,7 +2109,7 @@ and you do not need to specify it.)
          Charcount offset = BUF_PT (buf) - search_regs.start[0];
 
          c = string_char (XSTRING (newtext), strpos);
-         if (c == '\\')
+         if (c == '\\' && strpos < stlen - 1)
            {
              c = string_char (XSTRING (newtext), ++strpos);
              if (c == '&')