diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-22 08:50:14 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-22 08:50:14 +0000 |
| commit | 95a6be1a177976e75e06c1a8f55b438898bee3a2 (patch) | |
| tree | 1cfdb935b9717ef55fc34e91e36f0074f0208993 /transcode.c | |
| parent | 9cda3a35b2cbe7d52798f5c23e0d1da17945acb2 (diff) | |
| download | ruby-95a6be1a177976e75e06c1a8f55b438898bee3a2.tar.gz | |
* transcode.c (str_transcode0): don't scrub invalid chars if
str.encode doesn't have explicit invalid: :replace.
workaround fix for see #8995
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
| -rw-r--r-- | transcode.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/transcode.c b/transcode.c index 386942689a..0182a205c2 100644 --- a/transcode.c +++ b/transcode.c @@ -2672,6 +2672,7 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts) rb_encoding *senc, *denc; const char *sname, *dname; int dencidx; + int explicitly_invalid_replace = TRUE; rb_check_arity(argc, 0, 2); @@ -2681,6 +2682,9 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts) if (!ecflags) return -1; arg1 = rb_obj_encoding(str); } + if (!(ecflags & ECONV_INVALID_MASK)) { + explicitly_invalid_replace = FALSE; + } ecflags |= ECONV_INVALID_REPLACE | ECONV_UNDEF_REPLACE; } else { @@ -2694,7 +2698,7 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts) ECONV_XML_ATTR_CONTENT_DECORATOR| ECONV_XML_ATTR_QUOTE_DECORATOR)) == 0) { if (senc && senc == denc) { - if (ecflags & ECONV_INVALID_MASK) { + if ((ecflags & ECONV_INVALID_MASK) && explicitly_invalid_replace) { VALUE rep = Qnil; if (!NIL_P(ecopts)) { rep = rb_hash_aref(ecopts, sym_replace); |