summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-03-13 20:33:12 -0700
committerYukihiro "Matz" Matsumoto <[email protected]>2013-03-13 20:33:12 -0700
commit9c640a08ae90f45ca4fd77637f094c7fa0e01636 (patch)
treea2dbc8e52136041f3a4bfcefcaf981affc889e64
parent4da772c0d48a4fe3da5a203f6b41689f93742dbe (diff)
parentd82fc884d358b1c7ee5f886c2555480826526762 (diff)
downloadmruby-9c640a08ae90f45ca4fd77637f094c7fa0e01636.tar.gz
mruby-9c640a08ae90f45ca4fd77637f094c7fa0e01636.zip
Merge pull request #1000 from iij/pr-set-data-type-asap
DATA_TYPE must be set as soon as possible
-rw-r--r--mrbgems/mruby-time/src/time.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c
index 3d806c140..74882e1e8 100644
--- a/mrbgems/mruby-time/src/time.c
+++ b/mrbgems/mruby-time/src/time.c
@@ -528,6 +528,8 @@ mrb_time_initialize(mrb_state *mrb, mrb_value self)
if (tm) {
mrb_time_free(mrb, tm);
}
+ DATA_TYPE(self) = &mrb_time_type;
+ DATA_PTR(self) = NULL;
n = mrb_get_args(mrb, "|iiiiiii",
&ayear, &amonth, &aday, &ahour, &amin, &asec, &ausec);
@@ -538,7 +540,6 @@ mrb_time_initialize(mrb_state *mrb, mrb_value self)
tm = time_mktime(mrb, ayear, amonth, aday, ahour, amin, asec, ausec, MRB_TIMEZONE_LOCAL);
}
DATA_PTR(self) = tm;
- DATA_TYPE(self) = &mrb_time_type;
return self;
}