diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-14 07:42:08 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-14 07:42:08 +0000 |
| commit | 62550b1d0f07389e2806540047b8ea409ec2d707 (patch) | |
| tree | c92bb297985f052911a751f93652395f678eee44 /transcode.c | |
| parent | 640c135cbe3a0147cca1e9bf767d8cc5ae72b2bd (diff) | |
merge revision(s) 51116: [Backport #11324]
* transcode.c (rb_econv_set_replacement): target encoding name can
be empty now. [ruby-core:69841] [Bug #11324]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51573 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 b9d0adc553..5e20fd73a4 100644 --- a/transcode.c +++ b/transcode.c @@ -2199,7 +2199,7 @@ rb_econv_set_replacement(rb_econv_t *ec, encname2 = rb_econv_encoding_to_insert_output(ec); - if (encoding_equal(encname, encname2)) { + if (!*encname2 || encoding_equal(encname, encname2)) { str2 = xmalloc(len); MEMCPY(str2, str, unsigned char, len); /* xxx: str may be invalid */ len2 = len; |