diff --git a/libc/bionic/system_properties.c b/libc/bionic/system_properties.c index 4c2e5a21f..fd5643145 100644 --- a/libc/bionic/system_properties.c +++ b/libc/bionic/system_properties.c @@ -325,6 +325,8 @@ static void *to_prop_obj(prop_off_t off) { if (off > pa_data_size) return NULL; + if (!__system_property_area__) + return NULL; return __system_property_area__->data + off; } @@ -384,6 +386,8 @@ static const prop_info *find_property(prop_bt *trie, const char *name, { const char *remaining_name = name; + if (!trie) return NULL; + while (true) { char *sep = strchr(remaining_name, '.'); bool want_subtree = (sep != NULL);