* transcode.c (rb_econv_prepare_opts): raise ArgumentError if

  a broken string is specified as a replacement.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 1 deletions

diff --git a/transcode.c b/transcode.c
index e7c66ff425..45205dabbd 100644
--- a/transcode.c
+++ b/transcode.c
@@ -2254,7 +2254,6 @@ econv_opts(VALUE opt)
     }
     else if (v==sym_replace) {
         ecflags |= ECONV_INVALID_REPLACE;
-        v = rb_hash_aref(opt, sym_replace);
     }
     else {
         rb_raise(rb_eArgError, "unknown value for invalid character option");
@@ -2315,6 +2314,12 @@ rb_econv_prepare_opts(VALUE opthash, VALUE *opts)
         VALUE v = rb_hash_aref(opthash, sym_replace);
         if (!NIL_P(v)) {
             StringValue(v);
+            if (rb_enc_str_coderange(v) == ENC_CODERANGE_BROKEN) {
+                VALUE dumped = rb_str_dump(v);
+                rb_raise(rb_eArgError, "replacement string is broken: %s as %s",
+                        StringValueCStr(dumped),
+                        rb_enc_name(rb_enc_get(v)));
+            }
             v = rb_str_new_frozen(v);
             newhash = rb_hash_new();
             rb_hash_aset(newhash, sym_replace, v);