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

py/objtype: Fix assertion failures in super_attr by checking type. 

Fixes assertion failures and segmentation faults when making calls like:

    super(1, 1).x
This commit is contained in:
Jeff Epler 2018-03-25 16:13:49 -05:00 committed by Damien George
parent 05b13fd292
commit c60589c02b
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
py/objtype.c
View File

@ -1112,6 +1112,9 @@ STATIC mp_obj_t super_make_new(const mp_obj_type_t *type_in, size_t n_args, size
// 0 arguments are turned into 2 in the compiler
// 1 argument is not yet implemented
mp_arg_check_num(n_args, n_kw, 2, 2, false);
if (!MP_OBJ_IS_TYPE(args[0], &mp_type_type)) {
mp_raise_TypeError(NULL);
}
mp_obj_super_t *o = m_new_obj(mp_obj_super_t);
*o = (mp_obj_super_t){{type_in}, args[0], args[1]};
return MP_OBJ_FROM_PTR(o);

6
tests/basics/class_super.py
View File

@ -35,6 +35,12 @@ class B(A):
return super().foo().count(2) # calling a subsequent method
print(B().foo())
# first arg to super must be a type
try:
super(1, 1)
except TypeError:
print('TypeError')
# store/delete of super attribute not allowed
assert hasattr(super(B, B()), 'foo')
try: