Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-08 22:55:30 +00:00
committed by Android (Google) Code Review
parent aa72b51c17 cc0bba36c7
commit 8ccca289bf
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/statsd/src/guardrail/StatsdStats.cpp
View File

@@ -459,9 +459,12 @@ void StatsdStats::notePullExceedMaxDelay(int pullAtomId) {
void StatsdStats::noteAtomLogged(int atomId, int32_t timeSec) { void StatsdStats::noteAtomLogged(int atomId, int32_t timeSec) {
lock_guard<std::mutex> lock(mLock); lock_guard<std::mutex> lock(mLock);
if (atomId <= kMaxPushedAtomId) { if (atomId >= 0 && atomId <= kMaxPushedAtomId) {
mPushedAtomStats[atomId]++; mPushedAtomStats[atomId]++;
} else { } else {
if (atomId < 0) {
android_errorWriteLog(0x534e4554, "187957589");
}
if (mNonPlatformPushedAtomStats.size() < kMaxNonPlatformPushedAtoms) { if (mNonPlatformPushedAtomStats.size() < kMaxNonPlatformPushedAtoms) {
mNonPlatformPushedAtomStats[atomId]++; mNonPlatformPushedAtomStats[atomId]++;
} }