djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extmod/moduselect: Fix unsigned/signed comparison for timeout!=-1.

Browse Source 
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2021-02-01 13:12:23 +11:00 committed by Damien George
parent a1a2815799
commit fce0bd1a2a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extmod/moduselect.c
View File

@ -148,7 +148,7 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
// poll the objects // poll the objects
mp_uint_t n_ready = poll_map_poll(&poll_map, rwx_len); mp_uint_t n_ready = poll_map_poll(&poll_map, rwx_len);
if (n_ready > 0 || (timeout != -1 && mp_hal_ticks_ms() - start_tick >= timeout)) { if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_tick >= timeout)) {
// one or more objects are ready, or we had a timeout // one or more objects are ready, or we had a timeout
mp_obj_t list_array[3]; mp_obj_t list_array[3];
list_array[0] = mp_obj_new_list(rwx_len[0], NULL); list_array[0] = mp_obj_new_list(rwx_len[0], NULL);
@ -250,7 +250,7 @@ STATIC mp_uint_t poll_poll_internal(uint n_args, const mp_obj_t *args) {
for (;;) { for (;;) {
// poll the objects // poll the objects
n_ready = poll_map_poll(&self->poll_map, NULL); n_ready = poll_map_poll(&self->poll_map, NULL);
if (n_ready > 0 || (timeout != -1 && mp_hal_ticks_ms() - start_tick >= timeout)) { if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_tick >= timeout)) {
break; break;
} }
MICROPY_EVENT_POLL_HOOK MICROPY_EVENT_POLL_HOOK