commit df7436e709035fb6f5667980042848c8b4ca3e79
author Elliott Hughes <enh@google.com> Tue Sep 03 21:07:15 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 03 21:07:16 2013 +0000
tree 7fa17a41ad718dd575b68a7a3698032d6bc16002
parent afa310427e04f067976e5b979e2cceb3d759bf3f
parent a21e696d905d12ee17481c5fe2ccbb67571c0572

Merge "Avoid segfaults if properties are not initialized"

libc/bionic/system_properties.c

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