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

py/modthread: Properly cast concrete exception pointer to an object.

Browse Source
This commit is contained in:
Damien George 2016-04-23 12:24:44 +00:00
parent a791be936a
commit 3eb7a26809
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
py/modthread.c
View File

@ -80,14 +80,15 @@ STATIC void *thread_entry(void *args_in) {
} else { } else {
// uncaught exception // uncaught exception
// check for SystemExit // check for SystemExit
if (mp_obj_is_subclass_fast(mp_obj_get_type((mp_obj_t)nlr.ret_val), &mp_type_SystemExit)) { mp_obj_base_t *exc = (mp_obj_base_t*)nlr.ret_val;
if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(exc->type), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
// swallow exception silently // swallow exception silently
} else { } else {
// print exception out // print exception out
mp_printf(&mp_plat_print, "Unhandled exception in thread started by "); mp_printf(&mp_plat_print, "Unhandled exception in thread started by ");
mp_obj_print_helper(&mp_plat_print, args->fun, PRINT_REPR); mp_obj_print_helper(&mp_plat_print, args->fun, PRINT_REPR);
mp_printf(&mp_plat_print, "\n"); mp_printf(&mp_plat_print, "\n");
mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val); mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(exc));
} }
} }