generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am df7436e7: Merge "Avoid segfaults if properties are not initialized"

Browse Source 
* commit 'df7436e709035fb6f5667980042848c8b4ca3e79':
  Avoid segfaults if properties are not initialized
This commit is contained in:
Elliott Hughes 2013-09-03 14:09:08 -07:00 committed by Android Git Automerger
commit 5d094c4088
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libc/bionic/system_properties.c
View File

@ -325,6 +325,8 @@ static void *to_prop_obj(prop_off_t off)
{ {
if (off > pa_data_size) if (off > pa_data_size)
return NULL; return NULL;
if (!__system_property_area__)
return NULL;
return __system_property_area__->data + off; 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; const char *remaining_name = name;
if (!trie) return NULL;
while (true) { while (true) {
char *sep = strchr(remaining_name, '.'); char *sep = strchr(remaining_name, '.');
bool want_subtree = (sep != NULL); bool want_subtree = (sep != NULL);