From 27c679b832c4600af81415c80741cb2619df5e08 Mon Sep 17 00:00:00 2001 From: usa Date: Sat, 10 Jan 2015 03:35:11 +0000 Subject: * eval_error.c (error_print): pos and len parameters of rb_str_substr() are counted by characters, not bytes. use rb_str_subseq() instead. [Bug #10727] [ruby-core:67473] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ eval_error.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0f8b7f34a0..b0b263c200 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jan 10 12:32:44 2015 NAKAMURA Usaku + + * eval_error.c (error_print): pos and len parameters of rb_str_substr() + are counted by characters, not bytes. use rb_str_subseq() instead. + [Bug #10727] [ruby-core:67473] + Sat Jan 10 10:58:55 2015 SHIBATA Hiroshi * complex.c: removed commented-out code. diff --git a/eval_error.c b/eval_error.c index 12cfe36571..405d738236 100644 --- a/eval_error.c +++ b/eval_error.c @@ -169,7 +169,7 @@ error_print(void) warn_print(")\n"); } if (tail) { - warn_print_str(rb_str_substr(e, tail - einfo, elen - len - 1)); + warn_print_str(rb_str_subseq(e, tail - einfo, elen - len - 1)); } if (tail ? einfo[elen-1] != '\n' : !epath) warn_print2("\n", 1); } -- cgit v1.2.3