am 032be7a4: Merge "Log an error if property pool is exhausted"

* commit '032be7a4c5be8c015063084d162d1f394279aa3d':
  Log an error if property pool is exhausted
This commit is contained in:
Colin Cross 2013-04-30 21:12:28 -07:00 committed by Android Git Automerger
commit 55d69a9681

View file

@ -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);