2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b30435a3a..f8bce27c85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 11 08:31:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* regex.c (read_special): fix parsing backslashes following \c in
+	  regexp.  fixed: [ruby-dev:26500]
+
 Sun Jul 10 22:18:17 CEST 2005	Michael Neumann	<mneumann@ruby-lang.org>
 
 	* lib/xmlrpc/server.rb (XMLRPC::Server): Switch from GServer over to
diff --git a/regex.c b/regex.c
index 1a53739327..a018e0781b 100644
--- a/regex.c
+++ b/regex.c
@@ -1162,7 +1162,7 @@ read_special(p, pend, pp)
     PATFETCH_RAW(c);
     *pp = p;
     if (c == '\\') {
-      return read_special(p, pend, pp) | 0x80;
+      return read_special(--p, pend, pp) | 0x80;
     }
     else if (c == -1) return ~0;
     else {
@@ -1176,12 +1176,13 @@ read_special(p, pend, pp)
     PATFETCH_RAW(c);
     *pp = p;
     if (c == '\\') {
-      c = read_special(p, pend, pp);
+      c = read_special(--p, pend, pp);
     }
     else if (c == '?') return 0177;
     else if (c == -1) return ~0;
     return c & 0x9f;
   default:
+    *pp = p + 1;
     return read_backslash(c);
   }
 
@@ -1577,7 +1578,7 @@ re_compile_pattern(pattern, size, bufp)
 	  case 'C':
 	  case 'c':
 	    {
-	      char *pp;
+	      const char *pp;
 
 	      --p;
 	      c = read_special(p, pend, &pp);