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

[RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: b13b741a94

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670131

Change-Id: I705d5c2e025d4e510cd10091e381d8d57f99b78d
This commit is contained in:
Tej Singh
2021-06-09 02:38:51 +00:00
committed by Automerger Merge Worker
parent 9ebf723235 b13b741a94
commit 22d3aa3546
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

@@ -449,9 +449,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 <= android::util::kMaxPushedAtomId) { if (atomId >= 0 && atomId <= android::util::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]++;
} }