summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-11-23 04:04:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-11-23 04:04:55 +0000
commit40a910f31d754d51f5bad471d695403ce5b30848 (patch)
treec30c3ef34286c165f43ab112ae85fb95d95f7470
parente8ebb8cd8df1d453918dfb6cf6711e69dee1126d (diff)
parentc18abedfe29eb51fec14797ecf0bb101d22900b2 (diff)
Merge "Fixes out of range bug in SimpleConditionTracker."
-rw-r--r--cmds/statsd/src/condition/SimpleConditionTracker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/statsd/src/condition/SimpleConditionTracker.cpp b/cmds/statsd/src/condition/SimpleConditionTracker.cpp
index ea5c64fd2b3a..d8099b34f39a 100644
--- a/cmds/statsd/src/condition/SimpleConditionTracker.cpp
+++ b/cmds/statsd/src/condition/SimpleConditionTracker.cpp
@@ -210,7 +210,7 @@ void SimpleConditionTracker::evaluateCondition(const LogEvent& event,
return;
}
- if (mStopAllLogMatcherIndex >= 0 &&
+ if (mStopAllLogMatcherIndex >= 0 && mStopAllLogMatcherIndex < int(eventMatcherValues.size()) &&
eventMatcherValues[mStopAllLogMatcherIndex] == MatchingState::kMatched) {
handleStopAll(conditionCache, conditionChangedCache);
return;