summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2013-04-30 21:12:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-30 21:12:28 -0700
commit55d69a9681061b97d6bdcc0b1b92a7de63d0a07b (patch)
tree85887d54f4187c51c48843190cec7e7404220e9f /init
parent63577d9280e7919bfb7221030d211b833e66bb1e (diff)
parent032be7a4c5be8c015063084d162d1f394279aa3d (diff)
downloadsystem_core-55d69a9681061b97d6bdcc0b1b92a7de63d0a07b.zip
system_core-55d69a9681061b97d6bdcc0b1b92a7de63d0a07b.tar.gz
system_core-55d69a9681061b97d6bdcc0b1b92a7de63d0a07b.tar.bz2
am 032be7a4: Merge "Log an error if property pool is exhausted"
* commit '032be7a4c5be8c015063084d162d1f394279aa3d': Log an error if property pool is exhausted
Diffstat (limited to 'init')
-rwxr-xr-xinit/property_service.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/init/property_service.c b/init/property_service.c
index 62b6c3d..e8c8869 100755
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -352,7 +352,11 @@ int property_set(const char *name, const char *value)
__futex_wake(&pa->serial, INT32_MAX);
} else {
pa = __system_property_area__;
- if(pa->count == PA_COUNT_MAX) return -1;
+ if(pa->count == PA_COUNT_MAX) {
+ ERROR("Failed to set '%s'='%s', property pool is exhausted at %d entries",
+ name, value, PA_COUNT_MAX);
+ return -1;
+ }
pi = pa_info_array + pa->count;
pi->serial = (valuelen << 24);