commit 916495b8427b2319be3066d5a5c9f30fdce4fcf9
author Thiébaud Weksteen <tweek@google.com> Fri May 15 10:52:32 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 15 10:52:32 2020 +0000
tree 39020b4e62bb5bf4843453dfdd3634701399eb49
parent caf155a30d589a80a220c7821e799f54fc7b395a
parent 356cc4a2502318f6c6156c14d48b369a60602c00

Merge "libavb_aftl: use read_mem in log root parser"

libavb_aftl/avb_aftl_util.c

diff --git a/libavb_aftl/avb_aftl_util.c b/libavb_aftl/avb_aftl_util.c
index 2d9d0f5..d537f42 100644
--- a/libavb_aftl/avb_aftl_util.c
+++ b/libavb_aftl/avb_aftl_util.c
@@ -801,6 +801,7 @@
 AftlImage* parse_aftl_image(uint8_t* aftl_blob, size_t aftl_blob_size) {
   AftlImage* image;
   AftlImageHeader* image_header;
+  AftlIcpEntry* entry;
   size_t image_size;
   size_t i;
   size_t remaining_size;
@@ -845,7 +846,12 @@
   aftl_blob += sizeof(AftlImageHeader);
   remaining_size = aftl_blob_size - sizeof(AftlImageHeader);
   for (i = 0; i < image->header.icp_count && remaining_size > 0; i++) {
-    image->entries[i] = parse_icp_entry(&aftl_blob, &remaining_size);
+    entry = parse_icp_entry(&aftl_blob, &remaining_size);
+    if (!entry) {
+      free_aftl_image(image);
+      return NULL;
+    }
+    image->entries[i] = entry;
   }
 
   return image;