diff options
| author | Tianjie <xunchang@google.com> | 2020-05-31 21:19:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-31 21:19:47 +0000 |
| commit | e9d982e00d5bdc02d26fc1d5c59a69449640f8e0 (patch) | |
| tree | f5b7824c352a272b701a6373e31c1d62b09aaead | |
| parent | ab9999411199460ffb5f101482e82bee262c66d0 (diff) | |
| parent | 187881e5961b19bf89c9f3ae1b9e0f102be67513 (diff) | |
| download | extras-e9d982e00d5bdc02d26fc1d5c59a69449640f8e0.tar.gz | |
Fix the parsing of images without hashtree descriptor am: 9760d1a21d am: 187881e596
Change-Id: I789e6a0ee79ed14cd6b6e9ec0776004aa1f5c80e
| -rw-r--r-- | libfec/avb_utils.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libfec/avb_utils.cpp b/libfec/avb_utils.cpp index 8913f2a1..849556ef 100644 --- a/libfec/avb_utils.cpp +++ b/libfec/avb_utils.cpp @@ -82,6 +82,10 @@ int parse_avb_image(fec_handle *f, const std::vector<uint8_t> &vbmeta) { const AvbHashtreeDescriptor *hashtree_descriptor_ptr = nullptr; avb_descriptor_foreach(vbmeta.data(), vbmeta.size(), parse_descriptor, &hashtree_descriptor_ptr); + if (!hashtree_descriptor_ptr) { + error("failed to find avb hashtree descriptor"); + return -1; + } AvbHashtreeDescriptor hashtree_descriptor; if (!avb_hashtree_descriptor_validate_and_byteswap(hashtree_descriptor_ptr, |