* encoding.c (rb_enc_associate_index, rb_enc_get_index): check if

  object is encoding capable.  [ruby-dev:31780]

* string.c (rb_str_subpat_set): check for if the argument is a String.


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

1 files changed, 1 insertions, 0 deletions

diff --git a/string.c b/string.c
index 3eaeb9e5db..e20007f0b9 100644
--- a/string.c
+++ b/string.c
@@ -1996,6 +1996,7 @@ rb_str_subpat_set(VALUE str, VALUE re, int nth, VALUE val)
     }
     end = RMATCH(match)->END(nth);
     len = end - start;
+    StringValue(val);
     rb_enc_check(str, val);
     rb_str_splice_0(str, start, len, val);
 }