* file.c (rb_file_chown): integer conversion should be prior to

  GetOpenFile().  [ruby-dev:24947]

* file.c (rb_file_truncate): ditto.

* file.c (rb_file_s_truncate): ditto.

* dir.c (dir_seek): use NUM2OFFT().

* misc/ruby-mode.el (ruby-non-block-do-re): [ruby-core:03719]

* dir.c (dir_seek): should retrieve dir_data after NUM2INT().
  [ruby-dev:24941]

* 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]

* string.c (str_gsub): internal buffer should not be listed by
  ObjectSpace.each_object() by String#gsub.  [ruby-dev:24931]

* lib/cgi/session.rb (CGI::Session::FileStore::initialize): raise
  exception if data corresponding to session specified from the
  client does not exist.

* string.c (str_gsub): internal buffer should not be listed by
  ObjectSpace.each_object().  [ruby-dev:24919]


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

1 files changed, 9 insertions, 3 deletions

diff --git a/string.c b/string.c
index acfd6f4bf9..8615bf5a56 100644
--- a/string.c
+++ b/string.c
@@ -1625,6 +1625,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);
@@ -1639,8 +1643,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);
@@ -2070,7 +2072,7 @@ str_gsub(argc, argv, str, bang)
     }
 
     blen = RSTRING(str)->len + 30; /* len + margin */
-    dest = rb_str_new5(str, 0, blen);
+    dest = str_new(0, 0, blen);
     buf = RSTRING(dest)->ptr;
     bp = buf;
     sp = cp = RSTRING(str)->ptr;
@@ -2086,6 +2088,9 @@ str_gsub(argc, argv, str, bang)
 	    val = rb_obj_as_string(rb_yield(rb_reg_nth_match(0, match)));
 	    str_mod_check(str, sp, slen);
 	    if (bang) str_frozen_check(str);
+	    if (val == dest) {  /* paranoid chack [ruby-dev:24827] */
+		rb_raise(rb_eRuntimeError, "block should not cheat");
+	    }
 	    rb_backref_set(match);
 	}
 	else {
@@ -2147,6 +2152,7 @@ str_gsub(argc, argv, str, bang)
 	RSTRING(dest)->len = 0;
     }
     else {
+	RBASIC(dest)->klass = rb_obj_class(str);
 	OBJ_INFECT(dest, str);
 	str = dest;
     }