| commit | 80627312d84e23b212b01901d36417bdd4a63dd1 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Mon May 09 15:41:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 09 15:41:57 2016 +0000 |
| tree | cd2ed86538fed2ee2102b30dfe5475205b106e53 | |
| parent | 6eaf9cf0e233ce1c71aa368207da087983cc9d76 [diff] | |
| parent | 7ae721bb53348c0773752bacd8c84a2467ed5bd5 [diff] |
Merge "Return correct length from pmsgRead()" am: fc2a8b2bd6 am: a76e171bf3 am: 7dcdd52cf6 * commit '7dcdd52cf6e80f516527838a86f9ef19ccdfd78f': Return correct length from pmsgRead() Change-Id: I095c55be3387c79b56871c7197988c96a8bb7cf4
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; } }