From 937e1bdc1f0ea71b10adca1b108ca0b45a600101 Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Wed, 16 Oct 2019 15:48:56 -0700 Subject: [PATCH] Use sizeof(android_log_header_t) instead of sizeof its components Particularly because sizeof_log_id_t is a misnomer and is going away. Test: build, liblog and logcat unit tests Change-Id: I7978bf83e44336a334229753ff1e11a07134e8fc --- cmds/statsd/src/socket/StatsSocketListener.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmds/statsd/src/socket/StatsSocketListener.cpp b/cmds/statsd/src/socket/StatsSocketListener.cpp index 92200f99c3ccb..b59d88dc1cea9 100755 --- 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))];