diff options
| author | Tianjie Xu <xunchang@google.com> | 2020-05-30 21:30:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-05-30 21:30:06 +0000 |
| commit | bb188735ca45d42f09f551fe942300b45ee1bfa7 (patch) | |
| tree | f83871473bac645afbe3dd30ae1817713e032aba | |
| parent | 3370d09f219ae380e07ca2a046c85473b3a84ad1 (diff) | |
| parent | 90e7155bdd10039448bbc5ee4636f14c0119718e (diff) | |
| download | extras-bb188735ca45d42f09f551fe942300b45ee1bfa7.tar.gz | |
Merge "Fix the parsing of images without hashtree descriptor"
| -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, |