commit 6edaf3f5e1908518e812b224693b970b73047b56
author Nick Kralevich <nnk@google.com> Tue Apr 07 17:46:23 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 07 17:46:23 2015 +0000
tree b39f0ec38128fe22b552a9f1a1ad8f75cefb8c39
parent d136aebd36ec12af31ddad4e45848e9e661ff394
parent 253374f578641787bf93fecf3115a209529cc187

Merge "logd: Don't embed a flexible array member within another struct"

logd/LogAudit.cpp

diff --git a/logd/LogAudit.cpp b/logd/LogAudit.cpp
index 6b3e637..bdb2915 100644
--- a/logd/LogAudit.cpp
+++ b/logd/LogAudit.cpp
@@ -150,9 +150,9 @@
         rc = -ENOMEM;
     } else {
         event->header.tag = htole32(AUDITD_LOG_TAG);
-        event->payload.type = EVENT_TYPE_STRING;
-        event->payload.length = htole32(l);
-        memcpy(event->payload.data, str, l);
+        event->type = EVENT_TYPE_STRING;
+        event->length = htole32(l);
+        memcpy(event->data, str, l);
 
         logbuf->log(LOG_ID_EVENTS, now, uid, pid, tid,
                     reinterpret_cast<char *>(event),