summaryrefslogtreecommitdiffstats
path: root/string.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-27 11:09:41 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-27 11:09:41 +0000
commit31d9967466f39602ddc741d4bba5362109b2b7a8 (patch)
tree13b8b1c22617281c85e378114a7957820465e645 /string.c
parentb55901ff4094dceb83357d21510f118762e51aa6 (diff)
downloadruby-31d9967466f39602ddc741d4bba5362109b2b7a8.tar.gz
ruby-31d9967466f39602ddc741d4bba5362109b2b7a8.tar.xz
ruby-31d9967466f39602ddc741d4bba5362109b2b7a8.zip
* string.c (rb_str_inspect): avoid exception by
"\#\xa1".force_encoding("euc-jp").inspect. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/string.c b/string.c
index 168e7a6b8..452e4affc 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') {