summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-01-24 03:13:12 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-01-24 03:13:12 +0000
commita65f508748c2cc2d4750ec6583a742287272da04 (patch)
tree7a87654870164718a4338720ec9b33d8b5752217
parent59c31de1e5361b28624fe7fbe4191a3b97ad1cc8 (diff)
parentbbd056ac4ac206bea36e6e8b40bf40c4a2d44f25 (diff)
Merge "Fix the crash when parsing empty config."
-rw-r--r--cmds/statsd/src/StatsService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp
index ca097d0623ca..ba628b849147 100644
--- a/cmds/statsd/src/StatsService.cpp
+++ b/cmds/statsd/src/StatsService.cpp
@@ -725,7 +725,7 @@ Status StatsService::addConfiguration(int64_t key,
if (checkCallingPermission(String16(kPermissionDump))) {
ConfigKey configKey(ipc->getCallingUid(), key);
StatsdConfig cfg;
- if (!cfg.ParseFromArray(&config[0], config.size())) {
+ if (config.empty() || !cfg.ParseFromArray(&config[0], config.size())) {
*success = false;
return Status::ok();
}