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 (offset_to_sec): fixed invalid validation.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2011-05-31 14:53:52 +00:00
parent 100931ac2c
commit 6a158e05c8
2 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue May 31 23:49:08 2011 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_core.c (offset_to_sec): fixed invalid validation.
Tue May 31 23:43:00 2011 Kenta Murata <mrkn@mrkn.jp> Tue May 31 23:43:00 2011 Kenta Murata <mrkn@mrkn.jp>
* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): replace the algorithm for * ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): replace the algorithm for

22
ext/date/date_core.c
View file

@ -1868,10 +1868,12 @@ offset_to_sec(VALUE vof, int *rof)
{ {
double n; double n;
n = NUM2DBL(vof); n = NUM2DBL(vof) * DAY_IN_SECONDS;
if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS) if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
return 0; return 0;
*rof = round(n * DAY_IN_SECONDS); *rof = round(n);
if (*rof != n)
rb_warning("fraction of offset is ignored");
return 1; return 1;
} }
case T_RATIONAL: case T_RATIONAL:
@ -1879,17 +1881,21 @@ offset_to_sec(VALUE vof, int *rof)
VALUE vs = day_to_sec(vof); VALUE vs = day_to_sec(vof);
VALUE vn = RRATIONAL(vs)->num; VALUE vn = RRATIONAL(vs)->num;
VALUE vd = RRATIONAL(vs)->den; VALUE vd = RRATIONAL(vs)->den;
long n, d; long n;
if (!FIXNUM_P(vn) || !FIXNUM_P(vd)) if (FIXNUM_P(vn) && FIXNUM_P(vd) && (FIX2LONG(vd) == 1))
n = FIX2LONG(vn);
else {
vn = f_round(vs);
if (!f_eqeq_p(vn, vs))
rb_warning("fraction of offset is ignored");
if (!FIXNUM_P(vn))
return 0; return 0;
n = FIX2LONG(vn); n = FIX2LONG(vn);
d = FIX2LONG(vd);
if (d != 1)
return 0;
if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS) if (n < -DAY_IN_SECONDS || n > DAY_IN_SECONDS)
return 0; return 0;
*rof = n; }
*rof = (int)n;
return 1; return 1;
} }
case T_STRING: case T_STRING: