commit 1c9a4562dc027e639f279dad93ef72ea999f22cf
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 16 16:53:17 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 16 16:53:17 2019 +0000
tree 91d5d1cc0756b7913decf747f5ab085d4ae39387
parent 18bb62d777e1ec3e1cc45e5f61a723c807f0bd53
parent 74caf6c9163babf40f5d789590668be0bda8a723

Merge "fs_mgr: avb check avb_slot_data"

fs_mgr/libfs_avb/avb_ops.cpp

diff --git a/fs_mgr/libfs_avb/avb_ops.cpp b/fs_mgr/libfs_avb/avb_ops.cpp
index 3b0ef0b..3efa794 100644
--- a/fs_mgr/libfs_avb/avb_ops.cpp
+++ b/fs_mgr/libfs_avb/avb_ops.cpp
@@ -186,6 +186,7 @@
             avb_slot_verify(&avb_ops_, requested_partitions, ab_suffix.c_str(), flags,
                             AVB_HASHTREE_ERROR_MODE_RESTART_AND_INVALIDATE, &avb_slot_data);
 
+    if (!avb_slot_data) return verify_result;
     // Copies avb_slot_data->vbmeta_images[].
     for (size_t i = 0; i < avb_slot_data->num_vbmeta_images; i++) {
         out_vbmeta_images->emplace_back(VBMetaData(avb_slot_data->vbmeta_images[i].vbmeta_data,