Skip to content

M
mruby
Unverified Commit 935a1355 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

time.c: fixed a bug on no builtin overflow (e.g. VC).

parent 65add8c6
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
mrbgems/mruby-time/src/time.c
View file @ 935a1355
...@@ -214,7 +214,7 @@ typedef mrb_int mrb_sec; ...@@ -214,7 +214,7 @@ typedef mrb_int mrb_sec;
MRB_TIME_T_UINT ? 0 : \ MRB_TIME_T_UINT ? 0 : \
(sizeof(time_t) <= 4 ? INT32_MIN : INT64_MIN) \ (sizeof(time_t) <= 4 ? INT32_MIN : INT64_MIN) \
) )
#define MRB_TIME_MAX ( \ #define MRB_TIME_MAX (time_t)( \
MRB_TIME_T_UINT ? (sizeof(time_t) <= 4 ? UINT32_MAX : UINT64_MAX) : \ MRB_TIME_T_UINT ? (sizeof(time_t) <= 4 ? UINT32_MAX : UINT64_MAX) : \
(sizeof(time_t) <= 4 ? INT32_MAX : INT64_MAX) \ (sizeof(time_t) <= 4 ? INT32_MAX : INT64_MAX) \
) )
...@@ -586,6 +586,7 @@ mrb_time_plus(mrb_state *mrb, mrb_value self) ...@@ -586,6 +586,7 @@ mrb_time_plus(mrb_state *mrb, mrb_value self)
int_overflow(mrb, "addition"); int_overflow(mrb, "addition");
} }
} }
sec = tm->sec + sec;
#endif #endif
return mrb_time_make_time(mrb, mrb_obj_class(mrb, self), sec, tm->usec+usec, tm->timezone); return mrb_time_make_time(mrb, mrb_obj_class(mrb, self), sec, tm->usec+usec, tm->timezone);
} }
...@@ -629,6 +630,7 @@ mrb_time_minus(mrb_state *mrb, mrb_value self) ...@@ -629,6 +630,7 @@ mrb_time_minus(mrb_state *mrb, mrb_value self)
int_overflow(mrb, "subtraction"); int_overflow(mrb, "subtraction");
} }
} }
sec = tm->sec - sec;
#endif #endif
return mrb_time_make_time(mrb, mrb_obj_class(mrb, self), sec, tm->usec-usec, tm->timezone); return mrb_time_make_time(mrb, mrb_obj_class(mrb, self), sec, tm->usec-usec, tm->timezone);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment