commit c890e48d81a20495cb8843e94ccaa8a83bce7623
author Kelvin Zhang <zhangkelvin@google.com> Wed Mar 29 13:22:04 2023 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 30 19:42:04 2023 +0000
tree 528d74e62c0c91c971a3771020d343f63de8b761
parent d795875bd9ab3a5383661a51229af9d2a684e545

Only read payload signature if input file contains one

Quality of life changes, this allows payload.py to parse partial
manifests captured by bugreports.

Test: th
Change-Id: Iaa317a3a4b8addbca8ea987aee9953c78fa1a679

scripts/update_payload/payload.py

diff --git a/scripts/update_payload/payload.py b/scripts/update_payload/payload.py
index b513f72..4abd63e 100644
--- a/scripts/update_payload/payload.py
+++ b/scripts/update_payload/payload.py
@@ -138,6 +138,8 @@
     else:
       self.name = payload_file.name
       self.payload_file = payload_file
+    self.payload_file_size = self.payload_file.seek(0, io.SEEK_END)
+    self.payload_file.seek(0, io.SEEK_SET)
     self.payload_file_offset = payload_file_offset
     self.manifest_hasher = None
     self.is_init = False
@@ -266,7 +268,7 @@
     self.metadata_size = self.header.size + self.header.manifest_len
     self.data_offset = self.metadata_size + self.header.metadata_signature_len
 
-    if self.manifest.signatures_offset and self.manifest.signatures_size:
+    if self.manifest.signatures_offset and self.manifest.signatures_size and self.manifest.signatures_offset + self.manifest.signatures_size <= self.payload_file_size:
       payload_signature_blob = self.ReadDataBlob(
           self.manifest.signatures_offset, self.manifest.signatures_size)
       payload_signature = update_metadata_pb2.Signatures()