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

extmod/moduos_dupterm: Handle exceptions in call to dupterm's .write()

Browse Source
This commit is contained in:
Paul Sokolovsky 2016-01-01 22:05:30 +02:00
parent 30b7344eb0
commit 467504da01
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
extmod/moduos_dupterm.c
View File

@ -36,10 +36,21 @@
void mp_uos_dupterm_tx_strn(const char *str, size_t len) { void mp_uos_dupterm_tx_strn(const char *str, size_t len) {
if (MP_STATE_PORT(term_obj) != MP_OBJ_NULL) { if (MP_STATE_PORT(term_obj) != MP_OBJ_NULL) {
mp_obj_t write_m[3]; nlr_buf_t nlr;
mp_load_method(MP_STATE_PORT(term_obj), MP_QSTR_write, write_m); if (nlr_push(&nlr) == 0) {
write_m[2] = mp_obj_new_bytearray_by_ref(len, (char*)str); mp_obj_t write_m[3];
mp_call_method_n_kw(1, 0, write_m); mp_load_method(MP_STATE_PORT(term_obj), MP_QSTR_write, write_m);
write_m[2] = mp_obj_new_bytearray_by_ref(len, (char*)str);
mp_call_method_n_kw(1, 0, write_m);
nlr_pop();
} 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_printf(&mp_plat_print, "dupterm: ");
mp_obj_print_exception(&mp_plat_print, nlr.ret_val);
MP_STATE_PORT(term_obj) = save_term;
}
} }
} }