1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sprintf.c: avoid garbage in common (no exception) case

Browse Source 
Format strings which are dynamically-generated will benefit
from this.  This won't cover exceptions, but exceptions for
sprintf should be too uncommon to care about (unlike IO)

* sprintf.c (rb_str_format): use rb_str_tmp_frozen_{acquire,release}
* test/ruby/test_sprintf.rb (test_no_hidden_garbage): new test

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2017-01-31 00:41:56 +00:00
parent 4b9a21cdd6
commit ba5aa60668
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sprintf.c
View File

@ -475,6 +475,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
int tainted = 0; int tainted = 0;
VALUE nextvalue; VALUE nextvalue;
VALUE tmp; VALUE tmp;
VALUE orig;
VALUE str; VALUE str;
volatile VALUE hash = Qundef; volatile VALUE hash = Qundef;
@ -498,7 +499,8 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
if (OBJ_TAINTED(fmt)) tainted = 1; if (OBJ_TAINTED(fmt)) tainted = 1;
StringValue(fmt); StringValue(fmt);
enc = rb_enc_get(fmt); enc = rb_enc_get(fmt);
fmt = rb_str_new4(fmt); orig = fmt;
fmt = rb_str_tmp_frozen_acquire(fmt);
p = RSTRING_PTR(fmt); p = RSTRING_PTR(fmt);
end = p + RSTRING_LEN(fmt); end = p + RSTRING_LEN(fmt);
blen = 0; blen = 0;
@ -1196,7 +1198,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
} }
sprint_exit: sprint_exit:
RB_GC_GUARD(fmt); rb_str_tmp_frozen_release(orig, fmt);
/* XXX - We cannot validate the number of arguments if (digit)$ style used. /* XXX - We cannot validate the number of arguments if (digit)$ style used.
*/ */
if (posarg >= 0 && nextarg < argc) { if (posarg >= 0 && nextarg < argc) {

10
test/ruby/test_sprintf.rb
View File

@ -451,4 +451,14 @@ class TestSprintf < Test::Unit::TestCase
bug = 'https://github.com/mruby/mruby/issues/3347' bug = 'https://github.com/mruby/mruby/issues/3347'
assert_equal("!", sprintf("%*c", 0, ?!.ord), bug) assert_equal("!", sprintf("%*c", 0, ?!.ord), bug)
end end
def test_no_hidden_garbage
fmt = [4, 2, 2].map { |x| "%0#{x}d" }.join('-') # defeats optimization
ObjectSpace.count_objects(res = {}) # creates strings on first call
before = ObjectSpace.count_objects(res)[:T_STRING]
val = sprintf(fmt, 1970, 1, 1)
after = ObjectSpace.count_objects(res)[:T_STRING]
assert_equal before + 1, after, 'only new string is the created one'
assert_equal '1970-01-01', val
end
end end