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

Merge pull request #6193 from tannewt/fix_empty_mdns

Browse Source 
Fix MDNS crash on S2
This commit is contained in:
Jeff Epler 2022-03-26 15:05:17 -05:00 committed by GitHub
commit 35aa32bec0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/espressif/common-hal/mdns/Server.c
View File

@ -117,6 +117,11 @@ mp_obj_t common_hal_mdns_server_find(mdns_server_obj_t *self, const char *servic
next = next->next; next = next->next;
} }
mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(num_results, NULL)); mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(num_results, NULL));
// The empty tuple object is shared and stored in flash so return early if
// we got it. Without this we'll crash when trying to set len below.
if (num_results == 0) {
return MP_OBJ_FROM_PTR(tuple);
}
next = results; next = results;
// Don't error if we're out of memory. Instead, truncate the tuple. // Don't error if we're out of memory. Instead, truncate the tuple.
uint8_t added = 0; uint8_t added = 0;