diff options
| author | Benoit Goby <benoit@android.com> | 2013-09-24 16:15:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-24 16:15:43 -0700 |
| commit | 4820022b5edb0d19e268d836c25aa628b4378aba (patch) | |
| tree | 4042a09a6c6334d163ba0b7d29955ea877bbfdd1 /init | |
| parent | bcea352d2ce59c98414d15cb38f16d4c1abe2b72 (diff) | |
| parent | 0b7d588d531691904530ba57d772b31fb24ed343 (diff) | |
| download | system_core-4820022b5edb0d19e268d836c25aa628b4378aba.zip system_core-4820022b5edb0d19e268d836c25aa628b4378aba.tar.gz system_core-4820022b5edb0d19e268d836c25aa628b4378aba.tar.bz2 | |
am 0b7d588d: am f2c4c4ad: Merge "init: Fix queue_all_property_triggers with nonexistent properties"
* commit '0b7d588d531691904530ba57d772b31fb24ed343':
init: Fix queue_all_property_triggers with nonexistent properties
Diffstat (limited to 'init')
| -rw-r--r-- | init/init_parser.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/init/init_parser.c b/init/init_parser.c index 7c2fa8c..667c7ab 100644 --- a/init/init_parser.c +++ b/init/init_parser.c @@ -552,12 +552,14 @@ void queue_all_property_triggers() if (length > PROP_NAME_MAX) { ERROR("property name too long in trigger %s", act->name); } else { + int ret; memcpy(prop_name, name, length); prop_name[length] = 0; /* does the property exist, and match the trigger value? */ - property_get(prop_name, value); - if (!strcmp(equals + 1, value) ||!strcmp(equals + 1, "*")) { + ret = property_get(prop_name, value); + if (ret > 0 && (!strcmp(equals + 1, value) || + !strcmp(equals + 1, "*"))) { action_add_queue_tail(act); } } |