summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tom Cherry <tomcherry@google.com> 2019-10-17 13:41:42 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-10-17 13:41:42 +0000
commit8facba432617cf9efbcd0e13b59dd8a62bb03e9f (patch)
treea2fd882062e3bf2c595b5ea3089ddb41b8adfb8f
parent22027a86e29942c2a2d76d2ecec41c196e94436d (diff)
parent937e1bdc1f0ea71b10adca1b108ca0b45a600101 (diff)
Merge "Use sizeof(android_log_header_t) instead of sizeof its components"
-rwxr-xr-xcmds/statsd/src/socket/StatsSocketListener.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds/statsd/src/socket/StatsSocketListener.cpp b/cmds/statsd/src/socket/StatsSocketListener.cpp
index 92200f99c3cc..b59d88dc1cea 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))];