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

py/runtime: Fix crash when exc __new__ doesn't return an exc instance. 

See CPython bug https://bugs.python.org/issue39091 for more details.
This commit is contained in:
Mike Wadsten 2020-01-13 11:51:04 -06:00 committed by Damien George
parent 30268c93dc
commit fe2bc92b4d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
py/runtime.c
View File

@ -1372,8 +1372,10 @@ mp_obj_t mp_make_raise_obj(mp_obj_t o) {
// create and return a new exception instance by calling o
// TODO could have an option to disable traceback, then builtin exceptions (eg TypeError)
// could have const instances in ROM which we return here instead
return mp_call_function_n_kw(o, 0, 0, NULL);
} else if (mp_obj_is_exception_instance(o)) {
o = mp_call_function_n_kw(o, 0, 0, NULL);
}
if (mp_obj_is_exception_instance(o)) {
// o is an instance of an exception, so use it as the exception
return o;
} else {