commit 1e1d71e26c83cb1fb5ffbf2f809a9f000dfbdd50
author Mark Salyzyn <salyzyn@google.com> Mon Sep 22 10:58:36 2014 -0700
committer Mark Salyzyn <salyzyn@google.com> Wed Oct 08 14:01:45 2014 -0700
tree 9bcc3b0b2b0ca3101bb78db838ab2182508441df
parent a0e53540daa67142abd93756fad38a69eab8fbce

logd: LogStatistics leak

- uid = -1 in subtract operation to match add

(cherry pick from commit f48ea7c8dcfbf2220ececccb1f4fb2f42df9048c)

Bug: 15986335
Change-Id: I7d0b85b5334c5264fd04309cb78e0c9aec0ad261

logd/LogStatistics.cpp

diff --git a/logd/LogStatistics.cpp b/logd/LogStatistics.cpp
index 42ac287..792044c 100644
--- a/logd/LogStatistics.cpp
+++ b/logd/LogStatistics.cpp
@@ -302,6 +302,10 @@
 }
 
 void LidStatistics::subtract(unsigned short size, uid_t uid, pid_t pid) {
+    if (uid == (uid_t) -1) { // init
+        uid = (uid_t) AID_ROOT;
+    }
+
     UidStatisticsCollection::iterator it;
     for (it = begin(); it != end(); ++it) {
         UidStatistics *u = *it;