From 3d28b3bf3b965f828de09274996d9ac936b8e9ce Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 13 Dec 2008 10:35:06 +0000 Subject: [PATCH] * string.c (sym_printable): wrong condition for string iteration. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ string.c | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0cb42a9fc3..b5b817682d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Dec 13 18:34:43 2008 Yukihiro Matsumoto + + * string.c (sym_printable): wrong condition for string iteration. + Sat Dec 13 16:04:48 2008 Yuki Sonoda (Yugui) * encoding.c (default_external): endless recursion during diff --git a/string.c b/string.c index 8b16d5eb12..f940966753 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); }