Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

modutime.c: Ensure proper smallint values on overflow #115

Merged
merged 3 commits into from
Jan 23, 2018
Merged

modutime.c: Ensure proper smallint values on overflow #115

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8576cd
esp32/mods/modutime.c: Ensure proper smallint values on overflow
robert-hh Dec 25, 2017
6517888
mods/utime.c: avoid overrun exception in ticks_diff()
robert-hh Jan 10, 2018
93f32ea
modus/modutime.c: avoid the overrun condition when using results from…
robert-hh Jan 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions esp32/mods/modutime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,12 +170,19 @@ STATIC mp_obj_t time_ticks_cpu(void) {
STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_ticks_cpu_obj, time_ticks_cpu);

STATIC mp_obj_t time_ticks_diff(mp_obj_t start_in, mp_obj_t end_in) {
uint32_t start = mp_obj_get_int(start_in);
uint32_t end = mp_obj_get_int(end_in);
return mp_obj_new_int_from_uint((end - start));
int32_t start = mp_obj_get_int_truncated(start_in);
int32_t end = mp_obj_get_int_truncated(end_in);
return mp_obj_new_int(end - start);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(time_ticks_diff_obj, time_ticks_diff);

STATIC mp_obj_t time_ticks_add(mp_obj_t start_in, mp_obj_t delta_in) {
int32_t start = mp_obj_get_int_truncated(start_in);
int32_t delta = mp_obj_get_int_truncated(delta_in);
return mp_obj_new_int(start + delta);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(time_ticks_add_obj, time_ticks_add);

/// \function time()
/// Returns the number of seconds, as an integer, since 1/1/1970.
STATIC mp_obj_t time_time(void) {
Expand Down Expand Up @@ -208,6 +215,7 @@ STATIC const mp_map_elem_t time_module_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_ticks_ms), (mp_obj_t)&time_ticks_ms_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_ticks_us), (mp_obj_t)&time_ticks_us_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_ticks_cpu), (mp_obj_t)&time_ticks_cpu_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_ticks_add), (mp_obj_t)&time_ticks_add_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_ticks_diff), (mp_obj_t)&time_ticks_diff_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&time_time_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_timezone), (mp_obj_t)&time_timezone_obj },
Expand Down