Merge "Use sizeof(android_log_header_t) instead of sizeof its components" am: 8facba4326 am: 7b1e0eee95

am: c5f477dd78 Change-Id: Icdc0495fce3c2b7caf8e3b7de08676ae3ea081c6
2019-10-17 07:05:17 -07:00
parent db995575ac c5f477dd78
commit d77317087c
1 changed files with 1 additions and 2 deletions
--- a/cmds/statsd/src/socket/StatsSocketListener.cpp
+++ b/cmds/statsd/src/socket/StatsSocketListener.cpp
@@ -56,8 +56,7 @@ bool StatsSocketListener::onDataAvailable(SocketClient* cli) {
    }

    // + 1 to ensure null terminator if MAX_PAYLOAD buffer is received
-    char buffer[sizeof_log_id_t + sizeof(uint16_t) + sizeof(log_time) + LOGGER_ENTRY_MAX_PAYLOAD +
-                1];
+    char buffer[sizeof(android_log_header_t) + LOGGER_ENTRY_MAX_PAYLOAD + 1];
    struct iovec iov = {buffer, sizeof(buffer) - 1};

    alignas(4) char control[CMSG_SPACE(sizeof(struct ucred))];