diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-19 16:59:11 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-19 16:59:11 +0000 |
commit | 77a23fba355e5303da1182255bef800ee6acc468 (patch) | |
tree | 2db9083082e24f1742da09ce7899a7427f965ae9 /string.c | |
parent | a6610efee851bb8cd6dd2a312062c372abaef765 (diff) | |
download | ruby-77a23fba355e5303da1182255bef800ee6acc468.tar.gz |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r-- | string.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -2075,10 +2075,7 @@ str_gsub(argc, argv, str, bang) } blen = RSTRING(str)->len + 30; /* len + margin */ - dest = rb_str_new5(str, 0, blen); - if (bang) { - RBASIC(dest)->klass = 0; - } + dest = str_new(0, 0, blen); buf = RSTRING(dest)->ptr; bp = buf; sp = cp = RSTRING(str)->ptr; @@ -2158,6 +2155,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; } |