kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/date/date_core.c: flattened format to strftimev.

Browse source 
* ext/date/date_core.c (date_strftime_internal): taints run.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2011-06-06 12:05:12 +00:00
parent 5574d874fb
commit 2cdd0a87ef
3 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Jun 6 21:02:12 2011 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_core.c: flattened format to strftimev.
* ext/date/date_core.c (date_strftime_internal): taints run.
Mon Jun 6 15:10:17 2011 NAKAMURA Usaku <usa@ruby-lang.org> Mon Jun 6 15:10:17 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* include/ruby/{defines,missing}.h (rb_infinity, rb_nan): move from * include/ruby/{defines,missing}.h (rb_infinity, rb_nan): move from

20
ext/date/date_core.c
View file

@ -6476,6 +6476,8 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
for (fmt = p; p < pe && !*p; ++p); for (fmt = p; p < pe && !*p; ++p);
if (p > fmt) rb_str_cat(str, fmt, p - fmt); if (p > fmt) rb_str_cat(str, fmt, p - fmt);
} }
rb_enc_copy(str, vfmt);
OBJ_INFECT(str, vfmt);
return str; return str;
} }
else else
@ -6499,7 +6501,7 @@ static VALUE
d_lite_strftime(int argc, VALUE *argv, VALUE self) d_lite_strftime(int argc, VALUE *argv, VALUE self)
{ {
return date_strftime_internal(argc, argv, self, return date_strftime_internal(argc, argv, self,
"%F", set_tmx); "%Y-%m-%d", set_tmx);
} }
static VALUE static VALUE
@ -6529,7 +6531,7 @@ strftimev(const char *fmt, VALUE self,
static VALUE static VALUE
d_lite_asctime(VALUE self) d_lite_asctime(VALUE self)
{ {
return strftimev("%c", self, set_tmx); return strftimev("%a %b %e %H:%M:%S %Y", self, set_tmx);
} }
/* /*
@ -6542,7 +6544,7 @@ d_lite_asctime(VALUE self)
static VALUE static VALUE
d_lite_iso8601(VALUE self) d_lite_iso8601(VALUE self)
{ {
return strftimev("%F", self, set_tmx); return strftimev("%Y-%m-%d", self, set_tmx);
} }
/* /*
@ -6554,7 +6556,7 @@ d_lite_iso8601(VALUE self)
static VALUE static VALUE
d_lite_rfc3339(VALUE self) d_lite_rfc3339(VALUE self)
{ {
return strftimev("%FT%T%:z", self, set_tmx); return strftimev("%Y-%m-%dT%H:%M:%S%:z", self, set_tmx);
} }
/* /*
@ -6624,7 +6626,7 @@ d_lite_jisx0301(VALUE self)
if (!gengo(m_real_local_jd(dat), if (!gengo(m_real_local_jd(dat),
m_real_year(dat), m_real_year(dat),
argv)) argv))
return strftimev("%F", self, set_tmx); return strftimev("%Y-%m-%d", self, set_tmx);
return f_add(rb_f_sprintf(2, argv), return f_add(rb_f_sprintf(2, argv),
strftimev(".%m.%d", self, set_tmx)); strftimev(".%m.%d", self, set_tmx));
} }
@ -7690,7 +7692,7 @@ static VALUE
dt_lite_strftime(int argc, VALUE *argv, VALUE self) dt_lite_strftime(int argc, VALUE *argv, VALUE self)
{ {
return date_strftime_internal(argc, argv, self, return date_strftime_internal(argc, argv, self,
"%FT%T%:z", set_tmx); "%Y-%m-%dT%H:%M:%S%:z", set_tmx);
} }
static VALUE static VALUE
@ -7712,7 +7714,7 @@ dt_lite_iso8601_timediv(VALUE self, VALUE n)
f_expt(INT2FIX(10), n)))); f_expt(INT2FIX(10), n))));
f = rb_f_sprintf(3, argv); f = rb_f_sprintf(3, argv);
} }
fmt = f_add3(rb_usascii_str_new2("T%T"), fmt = f_add3(rb_usascii_str_new2("T%H:%M:%S"),
f, f,
rb_usascii_str_new2("%:z")); rb_usascii_str_new2("%:z"));
return strftimev(RSTRING_PTR(fmt), self, set_tmx); return strftimev(RSTRING_PTR(fmt), self, set_tmx);
@ -7736,7 +7738,7 @@ dt_lite_iso8601(int argc, VALUE *argv, VALUE self)
if (argc < 1) if (argc < 1)
n = INT2FIX(0); n = INT2FIX(0);
return f_add(strftimev("%F", self, set_tmx), return f_add(strftimev("%Y-%m-%d", self, set_tmx),
dt_lite_iso8601_timediv(self, n)); dt_lite_iso8601_timediv(self, n));
} }
@ -7775,7 +7777,7 @@ dt_lite_jisx0301(int argc, VALUE *argv, VALUE self)
if (!gengo(m_real_local_jd(dat), if (!gengo(m_real_local_jd(dat),
m_real_year(dat), m_real_year(dat),
argv2)) argv2))
return f_add(strftimev("%F", self, set_tmx), return f_add(strftimev("%Y-%m-%d", self, set_tmx),
dt_lite_iso8601_timediv(self, n)); dt_lite_iso8601_timediv(self, n));
return f_add(f_add(rb_f_sprintf(2, argv2), return f_add(f_add(rb_f_sprintf(2, argv2),
strftimev(".%m.%d", self, set_tmx)), strftimev(".%m.%d", self, set_tmx)),

2
test/date/test_switch_hitter.rb
View file

@ -375,6 +375,8 @@ class TestSH < Test::Unit::TestCase
assert_equal(false, s.tainted?) assert_equal(false, s.tainted?)
s = Date.today.strftime('new 105'.taint) s = Date.today.strftime('new 105'.taint)
assert_equal(true, s.tainted?) assert_equal(true, s.tainted?)
s = Date.today.strftime("new \000 105".taint)
assert_equal(true, s.tainted?)
s = DateTime.now.strftime('super $record') s = DateTime.now.strftime('super $record')
assert_equal(false, s.tainted?) assert_equal(false, s.tainted?)