commit a588de1f95531ae4a301c233034e877dfb8a80fd
author Dan Austin <danielaustin@google.com> Tue Nov 27 17:29:08 2018 -0800
committer android-build-merger <android-build-merger@google.com> Tue Nov 27 17:29:08 2018 -0800
tree 1e6639c270da1b2fc7ac4d2db5e3904faca2d14b
parent 6a622dbbd222e59b73f657df1d6cf285ec40efb9
parent 7575b1e68fbf1d62a21552efc76e500215d36235

Merge "Fix null pointer dereference in auditParse" am: 4380215033 am: 9b7d7a00d0
am: b47627f0cf

Change-Id: Ib1d1aaf251d17f3fbf849d7ee751b5bfe01a7cbd

logd/LogAudit.cpp

diff --git a/logd/LogAudit.cpp b/logd/LogAudit.cpp
index fc8c960..18d5287 100644
--- a/logd/LogAudit.cpp
+++ b/logd/LogAudit.cpp
@@ -165,9 +165,14 @@
         bug_num->assign("");
     }
 
+    // Ensure the uid name is not null before passing it to the bug string.
     if (uid >= AID_APP_START && uid <= AID_APP_END) {
-        bug_num->append(" app=");
-        bug_num->append(android::uidToName(uid));
+        char* uidname = android::uidToName(uid);
+        if (uidname) {
+            bug_num->append(" app=");
+            bug_num->append(uidname);
+            free(uidname);
+        }
     }
 }