| commit | 2dc7952e44a31ae7fd0d620809b4890b044bd60c | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Wed Jun 17 18:27:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 17 18:27:41 2020 +0000 |
| tree | ba6d95f8ca49a9820e8f32546b81a9aa6d012788 | |
| parent | 520470249e9911e81d8e00d7d35900d4aebe2f7c [diff] | |
| parent | a6dd55737acd1a51bedcf4d48bad58757aced951 [diff] |
Merge "liblog: fix reading pmsg" am: a6dd55737a Original change: https://android-review.googlesource.com/c/platform/system/core/+/1341014 Change-Id: I9535af260cf9eae83fa9b725b5cf1595c6429f7d
diff --git a/liblog/pmsg_reader.cpp b/liblog/pmsg_reader.cpp index 0e39aab..5640900 100644 --- a/liblog/pmsg_reader.cpp +++ b/liblog/pmsg_reader.cpp
@@ -96,7 +96,7 @@ ((logger_list->start.tv_sec != buf.l.realtime.tv_sec) || (logger_list->start.tv_nsec <= buf.l.realtime.tv_nsec)))) && (!logger_list->pid || (logger_list->pid == buf.p.pid))) { - char* msg = reinterpret_cast<char*>(&log_msg->entry) + log_msg->entry.hdr_size; + char* msg = reinterpret_cast<char*>(&log_msg->entry) + sizeof(log_msg->entry); *msg = buf.prio; fd = atomic_load(&logger_list->fd); if (fd <= 0) {