commit 236e664efa04bd92ce28ba553afebf8e79ca17fa
author Tao Bao <tbao@google.com> Mon Mar 07 22:25:02 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 07 22:25:03 2016 +0000
tree fbcb8560715fd5c68ee4e0ea91bf93ca91e1ce08
parent 74d4d98be1156982a1ab9a26be1dac26ee4e51d1
parent dca2200c8aa09b08ba0d37410a7826b737caecf2

Merge "releasetools: Fix the bug in AssertSequenceGood."

tools/releasetools/blockimgdiff.py

diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py
index 25d2743..625dca2 100644
--- a/tools/releasetools/blockimgdiff.py
+++ b/tools/releasetools/blockimgdiff.py
@@ -771,7 +771,10 @@
           x = x.subtract(sr)
 
       for s, e in x:
-        for i in range(s, e):
+        # Source image could be larger. Don't check the blocks that are in the
+        # source image only. Since they are not in 'touched', and won't ever
+        # be touched.
+        for i in range(s, min(e, self.tgt.total_blocks)):
           assert touched[i] == 0
 
       # Check that the output blocks for this transfer haven't yet