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

esp8266/esp_mphal: Don't swallow exceptions in dupterm's read()/write().

Browse Source 
The idea is that if dupterm object can handle exceptions, it will handle
them itself. Otherwise, object state can be compromised and it's better
to terminate dupterm session. For example, disconnected socket will keep
throwing exceptions and dump messages about that.
This commit is contained in:
Paul Sokolovsky 2016-04-13 16:32:57 +03:00
parent 54ea253f56
commit 19e3c9d53a
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
esp8266/esp_mphal.c
View File

@ -185,12 +185,9 @@ static int call_dupterm_read(void) {
nlr_pop(); nlr_pop();
return *(byte*)bufinfo.buf; return *(byte*)bufinfo.buf;
} else { } else {
// Temporarily disable dupterm to avoid infinite recursion
mp_obj_t save_term = MP_STATE_PORT(term_obj);
MP_STATE_PORT(term_obj) = NULL; MP_STATE_PORT(term_obj) = NULL;
mp_printf(&mp_plat_print, "dupterm: "); mp_printf(&mp_plat_print, "dupterm: Exception in read() method, deactivating: ");
mp_obj_print_exception(&mp_plat_print, nlr.ret_val); mp_obj_print_exception(&mp_plat_print, nlr.ret_val);
MP_STATE_PORT(term_obj) = save_term;
} }
return -1; return -1;