admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

time.c: check overflow in addition and subtraction of Time.

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-02-28 19:33:57 +09:00
parent 8684abd697
commit 03eb3b5e87
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-time/src/time.c
+8 -2
View File
@@ -565,7 +565,10 @@ mrb_time_plus(mrb_state *mrb, mrb_value self)
tm = time_get_ptr(mrb, self);
sec = mrb_to_time_t(mrb, o, &usec);
return mrb_time_make_time(mrb, mrb_obj_class(mrb, self), tm->sec+sec, tm->usec+usec, tm->timezone);
if (mrb_int_add_overflow(tm->sec, sec, &sec)) {
mrb_raise(mrb, E_RANGE_ERROR, "time_t overflow in Time");
}
return mrb_time_make_time(mrb, mrb_obj_class(mrb, self), sec, tm->usec+usec, tm->timezone);
}
static mrb_value
@@ -592,7 +595,10 @@ mrb_time_minus(mrb_state *mrb, mrb_value self)
else {
time_t sec, usec;
sec = mrb_to_time_t(mrb, other, &usec);
return mrb_time_make_time(mrb, mrb_obj_class(mrb, self), tm->sec-sec, tm->usec-usec, tm->timezone);
if (mrb_int_sub_overflow(tm->sec, sec, &sec)) {
mrb_raise(mrb, E_RANGE_ERROR, "time_t overflow in Time");
}
return mrb_time_make_time(mrb, mrb_obj_class(mrb, self), sec, tm->usec-usec, tm->timezone);
}
}