* string.c (rb_str_splice): should place index wrapping after

  possible modification.  [ruby-dev:24940]

* eval.c (error_print): nicer traceback at interrupt.
  [ruby-core:03774]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 2 deletions

diff --git a/string.c b/string.c
index 454959abc..40f5eb224 100644
--- a/string.c
+++ b/string.c
@@ -1628,6 +1628,10 @@ rb_str_splice(str, beg, len, val)
     VALUE val;
 {
     if (len < 0) rb_raise(rb_eIndexError, "negative length %ld", len);
+
+    StringValue(val);
+    rb_str_modify(str);
+
     if (RSTRING(str)->len < beg) {
       out_of_range:
 	rb_raise(rb_eIndexError, "index %ld out of string", beg);
@@ -1642,8 +1646,6 @@ rb_str_splice(str, beg, len, val)
 	len = RSTRING(str)->len - beg;
     }
 
-    StringValue(val);
-    rb_str_modify(str);
     if (len < RSTRING(val)->len) {
 	/* expand string */
 	RESIZE_CAPA(str, RSTRING(str)->len + RSTRING(val)->len - len + 1);