summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-25 09:07:32 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-25 09:07:32 +0000
commitead329fd8ea6f0ecf11c6ec98e073eed6fe2810c (patch)
tree058477d4c73b52a1dee3635363c5a947a54c7b5d /string.c
parent8e4c6d848216495cf4ddde1aae52f9ac3c0c0801 (diff)
* string.c (rb_str_inspect): don't call rb_enc_codepoint with empty
string. fix '#'.inspect. * encoding.c (rb_enc_codepoint): raise on empty string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/string.c b/string.c
index 7c49b34630..b06c2f5b8f 100644
--- a/string.c
+++ b/string.c
@@ -3025,7 +3025,8 @@ rb_str_inspect(VALUE str)
p += n;
if (c == '"'|| c == '\\' ||
- (c == '#' && (cc = rb_enc_codepoint(p,pend,enc),
+ (c == '#' && p < pend &&
+ (cc = rb_enc_codepoint(p,pend,enc),
(cc == '$' || cc == '@' || cc == '{')))) {
prefix_escape(result, c, enc);
}