diff options
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/encoding.c b/encoding.c index e2d3cdd8d..289fba72f 100644 --- a/encoding.c +++ b/encoding.c @@ -45,9 +45,14 @@ enc_new(rb_encoding *encoding) } VALUE -rb_enc_from_encoding(rb_encoding *enc) +rb_enc_from_encoding(rb_encoding *encoding) { - return enc_initialized_p(enc) ? ENC_FROM_ENCODING(enc) : enc_new(enc); + VALUE enc; + if (enc_initialized_p(encoding)) + return ENC_FROM_ENCODING(encoding); + enc = enc_new(encoding); + rb_enc_associate(enc, encoding); + return enc; } static rb_encoding * @@ -136,7 +141,8 @@ rb_enc_register(const char *name, rb_encoding *encoding) encoding = ent->enc; encoding->name = name; if (rb_cEncoding) { - enc_new(encoding); + VALUE enc = enc_new(encoding); + rb_enc_associate_index(enc, newsize); } else { encoding->auxiliary_data = ENC_UNINITIALIZED; @@ -229,6 +235,8 @@ enc_capable(VALUE obj) case T_REGEXP: case T_FILE: return Qtrue; + case T_DATA: + if (RDATA(obj)->dmark == enc_mark) return Qtrue; default: return Qfalse; } |