* string.c (rb_str_locktmp): check STR_TMPLOCK flag before

  locking.  [ruby-dev:24727]

* gc.c (gc_mark): stricter GC stack check.

* string.c (str_gsub): should have removed rb_str_unlocktmp(str).
  [ruby-dev:24708]

* string.c (str_gsub): string modify check no longer based on
  tmplock.  [ruby-dev:24706]


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

1 files changed, 0 insertions, 2 deletions

diff --git a/io.c b/io.c
index 37a30fa0d0..195392e565 100644
--- a/io.c
+++ b/io.c
@@ -463,10 +463,8 @@ io_write(io, str)
     f = GetWriteFile(fptr);
 
     rb_str_locktmp(str);
-    rb_str_locktmp(str);
     n = rb_io_fwrite(RSTRING(str)->ptr, RSTRING(str)->len, f);
     rb_str_unlocktmp(str);
-    rb_str_unlocktmp(str);
     if (n == -1L) rb_sys_fail(fptr->path);
     if (fptr->mode & FMODE_SYNC) {
 	io_fflush(f, fptr);