2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ee87a3d28..cce206c47d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 27 19:51:15 2008  Tanaka Akira  <akr@fsij.org>
+
+	* string.c (rb_str_inspect): avoid exception by
+	  "\#\xa1".force_encoding("euc-jp").inspect.
+
 Sun Jan 27 19:07:33 2008  Tanaka Akira  <akr@fsij.org>
 
 	* string.c (rb_str_succ): warning suppressed.
diff --git a/string.c b/string.c
index 168e7a6b82..452e4affc1 100644
--- a/string.c
+++ b/string.c
@@ -3311,9 +3311,11 @@ rb_str_inspect(VALUE str)
 
 	p += n;
 	if (c == '"'|| c == '\\' ||
-	    (c == '#' && p < pend &&
-                          (cc = rb_enc_codepoint(p,pend,enc),
-			  (cc == '$' || cc == '@' || cc == '{')))) {
+	    (c == '#' &&
+             p < pend &&
+             MBCLEN_CHARFOUND(rb_enc_precise_mbclen(p,pend,enc)) &&
+             (cc = rb_enc_codepoint(p,pend,enc),
+              (cc == '$' || cc == '@' || cc == '{')))) {
 	    prefix_escape(result, c, enc);
 	}
 	else if (c == '\n') {