diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-15 19:02:10 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-15 19:02:10 +0000 |
| commit | 9b71251e1e8f86972df2c0eda7c4209c5da7488a (patch) | |
| tree | b6c48f35a415eccd80f4dfb59b0572caf7d617aa /transcode.c | |
| parent | 243d224f285c8a4a5e4db344e2f4d4023cf8d2e9 (diff) | |
merge revision(s) 55181: [Backport #12431]
* transcode.c (str_transcode0): scrub in the given encoding when
the source encoding is given, not in the encoding of the
receiver. [ruby-core:75732] [Bug #12431]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55905 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
| -rw-r--r-- | transcode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transcode.c b/transcode.c index 0514adaf7e..8aa9cf3352 100644 --- a/transcode.c +++ b/transcode.c @@ -2700,7 +2700,7 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts) if (!NIL_P(ecopts)) { rep = rb_hash_aref(ecopts, sym_replace); } - dest = rb_str_scrub(str, rep); + dest = rb_enc_str_scrub(senc, str, rep); if (NIL_P(dest)) dest = str; *self = dest; return dencidx; |