From 814bc25b4c8107cdf221df11abf0f57bd8169848 Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 13 Dec 2008 10:35:06 +0000 Subject: * string.c (sym_printable): wrong condition for string iteration. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 8b16d5eb1..f94096675 100644 --- a/string.c +++ b/string.c @@ -6827,10 +6827,9 @@ sym_equal(VALUE sym1, VALUE sym2) static int -sym_printable(const char *s, rb_encoding *enc) +sym_printable(const char *s, const char *send, rb_encoding *enc) { - const char *send = s + strlen(s); - while (s) { + while (s < send) { int c = rb_enc_codepoint(s, send, enc); int n = rb_enc_codelen(c, enc); if (!rb_enc_isprint(c, enc)) return Qfalse; @@ -6862,7 +6861,7 @@ sym_inspect(VALUE sym) memcpy(RSTRING_PTR(str)+1, RSTRING_PTR(sym), RSTRING_LEN(sym)); if (RSTRING_LEN(sym) != strlen(RSTRING_PTR(sym)) || !rb_enc_symname_p(RSTRING_PTR(sym), enc) || - !sym_printable(RSTRING_PTR(sym), enc)) { + !sym_printable(RSTRING_PTR(sym), RSTRING_END(sym), enc)) { str = rb_str_inspect(str); strncpy(RSTRING_PTR(str), ":\"", 2); } -- cgit