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 ({d,dt}_lite_marshal_load): checks the given argument.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2011-03-11 17:28:44 +00:00
parent af7a09a687
commit ec40f71690
2 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Mar 12 02:27:07 2011 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_core.c ({d,dt}_lite_marshal_load): checks the given argument.
Sat Mar 12 01:26:24 2011 Tadayoshi Funaba <tadf@dotrb.org> Sat Mar 12 01:26:24 2011 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_core.c: changed some directives. * ext/date/date_core.c: changed some directives.

32
ext/date/date_core.c
View file

@ -988,7 +988,7 @@ d_lite_s_new_internal_wo_civil(VALUE klass, long jd, double sg,
static VALUE static VALUE
d_lite_s_alloc(VALUE klass) d_lite_s_alloc(VALUE klass)
{ {
return d_lite_s_new_internal_wo_civil(klass, 0, 0, 0); return d_lite_s_new_internal_wo_civil(klass, 0, 0, LIGHT_MODE);
} }
static VALUE static VALUE
@ -2361,20 +2361,28 @@ d_lite_marshal_load(VALUE self, VALUE a)
{ {
get_d1(self); get_d1(self);
if (!FIXNUM_P(RARRAY_PTR(a)[0])) { if (TYPE(a) != T_ARRAY)
rb_raise(rb_eTypeError, "expected an array");
switch (RARRAY_LEN(a)) {
case 3:
dat->r.ajd = RARRAY_PTR(a)[0]; dat->r.ajd = RARRAY_PTR(a)[0];
dat->r.of = RARRAY_PTR(a)[1]; dat->r.of = RARRAY_PTR(a)[1];
dat->r.sg = RARRAY_PTR(a)[2]; dat->r.sg = RARRAY_PTR(a)[2];
dat->r.cache = rb_hash_new(); dat->r.cache = rb_hash_new();
dat->r.flags = 0; dat->r.flags = 0;
} break;
else { case 2:
dat->l.jd = NUM2LONG(RARRAY_PTR(a)[0]); dat->l.jd = NUM2LONG(RARRAY_PTR(a)[0]);
dat->l.sg = NUM2DBL(RARRAY_PTR(a)[1]); dat->l.sg = NUM2DBL(RARRAY_PTR(a)[1]);
dat->l.year = 0; dat->l.year = 0;
dat->l.mon = 0; dat->l.mon = 0;
dat->l.mday = 0; dat->l.mday = 0;
dat->l.flags = LIGHT_MODE | HAVE_JD; dat->l.flags = LIGHT_MODE | HAVE_JD;
break;
default:
rb_raise(rb_eTypeError, "invalid size");
break;
} }
if (FL_TEST(a, FL_EXIVAR)) { if (FL_TEST(a, FL_EXIVAR)) {
@ -2436,7 +2444,7 @@ dt_lite_s_new_internal_wo_civil(VALUE klass, long jd, int df,
static VALUE static VALUE
dt_lite_s_alloc(VALUE klass) dt_lite_s_alloc(VALUE klass)
{ {
return dt_lite_s_new_internal_wo_civil(klass, 0, 0, 0, 0, 0, 0); return dt_lite_s_new_internal_wo_civil(klass, 0, 0, 0, 0, 0, LIGHT_MODE);
} }
static VALUE static VALUE
@ -3841,14 +3849,18 @@ dt_lite_marshal_load(VALUE self, VALUE a)
{ {
get_dt1(self); get_dt1(self);
if (!FIXNUM_P(RARRAY_PTR(a)[0])) { if (TYPE(a) != T_ARRAY)
rb_raise(rb_eTypeError, "expected an array");
switch (RARRAY_LEN(a)) {
case 3:
dat->r.ajd = RARRAY_PTR(a)[0]; dat->r.ajd = RARRAY_PTR(a)[0];
dat->r.of = RARRAY_PTR(a)[1]; dat->r.of = RARRAY_PTR(a)[1];
dat->r.sg = RARRAY_PTR(a)[2]; dat->r.sg = RARRAY_PTR(a)[2];
dat->r.cache = rb_hash_new(); dat->r.cache = rb_hash_new();
dat->r.flags = 0; dat->r.flags = 0;
} break;
else { case 5:
dat->l.jd = NUM2LONG(RARRAY_PTR(a)[0]); dat->l.jd = NUM2LONG(RARRAY_PTR(a)[0]);
dat->l.df = FIX2INT(RARRAY_PTR(a)[1]); dat->l.df = FIX2INT(RARRAY_PTR(a)[1]);
dat->l.sf = FIX2INT(RARRAY_PTR(a)[2]); dat->l.sf = FIX2INT(RARRAY_PTR(a)[2]);
@ -3861,6 +3873,10 @@ dt_lite_marshal_load(VALUE self, VALUE a)
dat->l.min = 0; dat->l.min = 0;
dat->l.sec = 0; dat->l.sec = 0;
dat->l.flags = LIGHT_MODE | HAVE_JD | HAVE_DF; dat->l.flags = LIGHT_MODE | HAVE_JD | HAVE_DF;
break;
default:
rb_raise(rb_eTypeError, "invalid size");
break;
} }
if (FL_TEST(a, FL_EXIVAR)) { if (FL_TEST(a, FL_EXIVAR)) {