commit 9faf90846bb01ddc3ff08158a02bbb1c7c3add16
author Mark Salyzyn <salyzyn@google.com> Thu Sep 01 07:28:44 2016 -0700
committer Mark Salyzyn <salyzyn@google.com> Fri Sep 02 07:41:27 2016 -0700
tree 3499ebe9435ccf59285b6d9ea129b08cfcbe3945
parent d788a29e720b0b461cb2eab49fabb1de4cbe47ce

logd: crash in prune mLastWorstPidOfSystem

mLastWorstPidOfSystem is supposed to be indexed by element->getPid()

Bug: 31237377
Bug: 30797725
Bug: 30688716
Change-Id: I81a55e92f175ded1c571a0aa8836736d86b36b1d

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index fa95733..0b195a6 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -678,7 +678,7 @@
                         && ((!gc && (element->getPid() == worstPid))
                            || (mLastWorstPidOfSystem[id].find(element->getPid())
                                 == mLastWorstPidOfSystem[id].end()))) {
-                    mLastWorstPidOfSystem[id][key] = it;
+                    mLastWorstPidOfSystem[id][element->getPid()] = it;
                 }
                 if ((!gc && !worstPid && (key == worst))
                         || (mLastWorst[id].find(key) == mLastWorst[id].end())) {