diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-17 08:55:00 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-17 08:55:00 +0000 |
| commit | 4bf78945ffe3fe696605a82ffcdcd69a4250667e (patch) | |
| tree | b120e3a2226e5233378cf14f9db20f0ec4ff4964 /transcode.c | |
| parent | 170f64d6ce826788d15a466268798f2b756e0fd9 (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_1@51614 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 1cb5631bce..406301cb8c 100644 --- a/transcode.c +++ b/transcode.c @@ -2201,7 +2201,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; |