commit 1246f1fb652b4764c705722272852fdf1ab8a06f
author Martijn Coenen <maco@google.com> Wed Nov 29 17:08:25 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 29 17:08:25 2017 +0000
tree d09f97ebfa03c1edd8ef59bf5ccbbea820a94af5
parent 1bae440efcbd446c0cd0c4b60e0f2576124ec4ee
parent 0d9dda2b69c47707e9fdf39d68b04b8edf5623ef

Merge "Fix debug output."

Debug.cpp

diff --git a/Debug.cpp b/Debug.cpp
index fb97069..d304d21 100644
--- a/Debug.cpp
+++ b/Debug.cpp
@@ -222,7 +222,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++) {