diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-04 00:53:21 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-04 00:53:21 +0000 |
commit | 27715649f4de175dc19e29c5bea6c323abb4b0d2 (patch) | |
tree | 8ea3214a7838720e3ac1ceedc4e5c7292b1fe27f /string.c | |
parent | 77d3f40c90ca3c28c8fa2ad3456f49c07a535267 (diff) | |
download | ruby-27715649f4de175dc19e29c5bea6c323abb4b0d2.tar.gz |
* gc.c (gc_mark): enable GC stack checking.
* string.c (str_gsub): lock strings temporarily. [ruby-dev:24687]
* ext/socket/socket.c (s_recvfrom): tmplock input buffer.
[ruby-dev:24705]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -464,6 +464,7 @@ str_independent(str) VALUE str; { if (FL_TEST(str, STR_TMPLOCK)) { + FL_UNSET(str, STR_TMPLOCK); rb_raise(rb_eRuntimeError, "can't modify string; temporarily locked"); } if (OBJ_FROZEN(str)) rb_error_frozen("string"); @@ -2075,6 +2076,8 @@ str_gsub(argc, argv, str, bang) bp = buf; cp = RSTRING(str)->ptr; + rb_str_locktmp(str); + rb_str_locktmp(dest); while (beg >= 0) { n++; match = rb_backref_get(); @@ -2132,6 +2135,8 @@ str_gsub(argc, argv, str, bang) } rb_backref_set(match); *bp = '\0'; + rb_str_unlocktmp(str); + rb_str_unlocktmp(dest); if (bang) { if (str_independent(str)) { free(RSTRING(str)->ptr); |