| commit | 7ae721bb53348c0773752bacd8c84a2467ed5bd5 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Mon May 09 15:36:23 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 09 15:36:23 2016 +0000 |
| tree | b977631306a16e65a50b57a9c2e6c8301a148124 | |
| parent | d2df05be5e5d827e9e356b8aac8f9b724f032e27 [diff] | |
| parent | 41aa930bb64790ee00d7d658fb561f18b5a95a2e [diff] |
Merge "Return correct length from pmsgRead()" am: fc2a8b2bd6 am: a76e171bf3 * commit 'a76e171bf351e3d26b3eb596188b6c9b2fcab3f4': Return correct length from pmsgRead() Change-Id: I616c3c889e99292454b0a7c33f999a56ada2c939
diff --git a/liblog/pmsg_reader.c b/liblog/pmsg_reader.c index f5e91c8..2e4fc5d 100644 --- a/liblog/pmsg_reader.c +++ b/liblog/pmsg_reader.c
@@ -227,7 +227,7 @@ log_msg->entry_v4.uid = buf.p.uid; } - return ret; + return ret + log_msg->entry_v4.hdr_size; } }