commit 317feed608ffc69c10577eab319f4abc14393841
author Hridya Valsaraju <hridya@google.com> Mon May 20 12:49:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 20 12:49:31 2019 -0700
tree 87fadfa22a32112525c51bfe5741d7e10c213c9a
parent 836b754ab2f0878206be6252cd29eae6bbbec359
parent 423d2594b7920b6f789789a45ac34ec07a727c6a

Merge "Check DTB image size for boot image header version 2 and above"
am: cd9b18f215

Change-Id: Ic6069e05af1aac0c307905bc0ee48cb04d957759

mkbootimg/mkbootimg.py

diff --git a/mkbootimg/mkbootimg.py b/mkbootimg/mkbootimg.py
index 92b11a5..934f28e 100644
--- a/mkbootimg/mkbootimg.py
+++ b/mkbootimg/mkbootimg.py
@@ -113,6 +113,10 @@
         args.output.write(pack('I', BOOT_IMAGE_HEADER_V2_SIZE))
 
     if args.header_version > 1:
+
+        if filesize(args.dtb) == 0:
+            raise ValueError("DTB image must not be empty.")
+
         args.output.write(pack('I', filesize(args.dtb)))   # size in bytes
         args.output.write(pack('Q', args.base + args.dtb_offset)) # dtb physical load address
     pad_file(args.output, args.pagesize)