commit d2013b44788f221479242386bd14a1ad95fb7a75
author Steven Moreland <smoreland@google.com> Wed Apr 03 18:21:57 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 03 18:21:57 2019 +0000
tree cea838d7faf6dc099a5e7ec9af79ea142c480e75
parent 06c65b864b3f7c2869f8d5b92cc53b1626c0b39a
parent d40633b00180bf7c3b81fb693b96e50583e9292f

Merge "Fix debug output."

libs/binder/Debug.cpp

diff --git a/libs/binder/Debug.cpp b/libs/binder/Debug.cpp
index f38bbb2..a1c2a8b 100644
--- a/libs/binder/Debug.cpp
+++ b/libs/binder/Debug.cpp
@@ -221,7 +221,11 @@
 
         for (word = 0; word < bytesPerLine; ) {
 
-            const size_t startIndex = word+(alignment-(alignment?1:0));
+            size_t align_offset = alignment-(alignment?1:0);
+            if (remain > 0 && (size_t)remain <= align_offset) {
+                align_offset = remain - 1;
+            }
+            const size_t startIndex = word+align_offset;
 
             for (index = 0; index < alignment || (alignment == 0 && index < bytesPerLine); index++) {