diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | encoding.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sat Jul 13 12:27:34 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * encoding.c (rb_enc_associate_index): fill new terminator length, not + old one. + Sat Jul 13 12:24:24 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/win32: move from ext/dl and ext/fiddle. since ext/extmk.rb diff --git a/encoding.c b/encoding.c index 7c64248d12..6e0777d24c 100644 --- a/encoding.c +++ b/encoding.c @@ -795,7 +795,7 @@ rb_enc_associate_index(VALUE obj, int idx) termlen = rb_enc_mbminlen(enc); oldtermlen = rb_enc_mbminlen(rb_enc_from_index(oldidx)); if (oldtermlen < termlen && RB_TYPE_P(obj, T_STRING)) { - rb_str_fill_terminator(obj, oldtermlen); + rb_str_fill_terminator(obj, termlen); } enc_set_index(obj, idx); return obj; |