commit 18977849c84ed47252e73b06c6122753fb5ab699
author Ivan Lozano <ivanlozano@google.com> Sat Jan 13 02:43:20 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 13 02:43:20 2018 +0000
tree 634ed9e5bebeee616c134752ed21e7905b6294d1
parent 46d5355af96d582b81d6fae0ff1d3ceb745863f5
parent b303f2e44177871760fc8578dd76e9a7a68eb577

Merge "Fix overflow sanitizer in copyWithAuthor."

media/libnbaio/NBLog.cpp

diff --git a/media/libnbaio/NBLog.cpp b/media/libnbaio/NBLog.cpp
index 2f639d2..827cba9 100644
--- a/media/libnbaio/NBLog.cpp
+++ b/media/libnbaio/NBLog.cpp
@@ -331,7 +331,8 @@
     *(int*) (buffer + sizeof(entry) + sizeof(HistTsEntry)) = author;
     // Update lengths
     buffer[offsetof(entry, length)] = sizeof(HistTsEntryWithAuthor);
-    buffer[sizeof(buffer) + Entry::kPreviousLengthOffset] = sizeof(HistTsEntryWithAuthor);
+    buffer[offsetof(entry, data) + sizeof(HistTsEntryWithAuthor) + offsetof(ending, length)]
+        = sizeof(HistTsEntryWithAuthor);
     // Write new buffer into FIFO
     dst->write(buffer, sizeof(buffer));
     return EntryIterator(mEntry).next();