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

Check for null local dictionaries

This commit is contained in:
Scott Shawcroft 2019-04-10 14:48:27 -07:00
parent 9f4f689879
commit debff19126
No known key found for this signature in database
GPG Key ID: FD0EDC4B6C53CA59
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
py/objtype.c
View File

@ -966,6 +966,9 @@ STATIC bool check_for_special_accessors(mp_obj_t key, mp_obj_t value) {
} }
STATIC bool map_has_special_accessors(const mp_map_t *map) { STATIC bool map_has_special_accessors(const mp_map_t *map) {
if (map == NULL) {
return false;
}
for (size_t i = 0; i < map->alloc; i++) { for (size_t i = 0; i < map->alloc; i++) {
if (MP_MAP_SLOT_IS_FILLED(map, i)) { if (MP_MAP_SLOT_IS_FILLED(map, i)) {
const mp_map_elem_t *elem = &map->table[i]; const mp_map_elem_t *elem = &map->table[i];
@ -1183,6 +1186,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
if (!(o->flags & TYPE_FLAG_HAS_SPECIAL_ACCESSORS) && if (!(o->flags & TYPE_FLAG_HAS_SPECIAL_ACCESSORS) &&
(map_has_special_accessors(locals_map) || (map_has_special_accessors(locals_map) ||
(num_native_bases == 1 && (num_native_bases == 1 &&
native_base->locals_dict != NULL &&
map_has_special_accessors(&native_base->locals_dict->map)))) { map_has_special_accessors(&native_base->locals_dict->map)))) {
o->flags |= TYPE_FLAG_HAS_SPECIAL_ACCESSORS; o->flags |= TYPE_FLAG_HAS_SPECIAL_ACCESSORS;
} }