archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 55181: [Backport #12431]

Browse source 
* 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
This commit is contained in:
nagachika 2016-08-15 19:02:10 +00:00
parent 243d224f28
commit 9b71251e1e
6 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Aug 16 03:51:59 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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]
Tue Aug 16 03:41:21 2016 Kazuki Yamaguchi <k@rhe.jp>
* ext/openssl/ossl_pkey_dh.c (ossl_dh_compute_key): Check that the DH

1
internal.h
View file

@ -1129,6 +1129,7 @@ VALUE rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg);
VALUE rb_external_str_with_enc(VALUE str, rb_encoding *eenc);
VALUE rb_str_cat_conv_enc_opts(VALUE newstr, long ofs, const char *ptr, long len,
rb_encoding *from, int ecflags, VALUE ecopts);
VALUE rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl);
#endif
#define STR_NOEMBED FL_USER1
#define STR_SHARED FL_USER2 /* = ELTS_SHARED */

8
string.c
View file

@ -8674,9 +8674,14 @@ str_compat_and_valid(VALUE str, rb_encoding *enc)
*/
VALUE
rb_str_scrub(VALUE str, VALUE repl)
{
return rb_enc_str_scrub(STR_ENC_GET(str), str, repl);
}
VALUE
rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl)
{
int cr = ENC_CODERANGE(str);
rb_encoding *enc;
int encidx;
VALUE buf = Qnil;
const char *rep;
@ -8686,7 +8691,6 @@ rb_str_scrub(VALUE str, VALUE repl)
if (ENC_CODERANGE_CLEAN_P(cr))
return Qnil;
enc = STR_ENC_GET(str);
if (!NIL_P(repl)) {
repl = str_compat_and_valid(repl, enc);
tainted = OBJ_TAINTED_RAW(repl);

3
test/ruby/test_transcode.rb
View file

@ -1213,6 +1213,9 @@ class TestTranscode < Test::Unit::TestCase
def test_invalid_replace_string
assert_equal("a<x>A", "a\x80A".encode("us-ascii", "euc-jp", :invalid=>:replace, :replace=>"<x>"))
assert_equal("a<x>A", "a\x80A".encode("us-ascii", "euc-jis-2004", :invalid=>:replace, :replace=>"<x>"))
s = "abcd\u{c1}"
r = s.b.encode("UTF-8", "UTF-8", invalid: :replace, replace: "\u{fffd}")
assert_equal(s, r)
end
def test_undef_replace

2
transcode.c
View file

@ -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;

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.2"
#define RUBY_RELEASE_DATE "2016-08-16"
#define RUBY_PATCHLEVEL 155
#define RUBY_PATCHLEVEL 156
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 8