diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-08-04 03:00:52 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-08-04 03:00:52 +0000 |
| commit | fbf541b0d9c1680de6b8d2d9a1c5d9bc10723a36 (patch) | |
| tree | d6c1c43d01a2167e4097275f658395ade14a75ad | |
| parent | 190c21752cd6182cf85f26bedbadb562e44c3542 (diff) | |
| parent | 26f0c1a3eeeca9e7dbe9f22748d93c05049ff2ee (diff) | |
Merge SP1A.210803.001
Change-Id: I77d158fbb301c6df753ef11561b9d51666de8168
| -rw-r--r-- | payload_consumer/filesystem_verifier_action.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/payload_consumer/filesystem_verifier_action.cc b/payload_consumer/filesystem_verifier_action.cc index 22c8e0bd..8b39f6d0 100644 --- a/payload_consumer/filesystem_verifier_action.cc +++ b/payload_consumer/filesystem_verifier_action.cc @@ -358,8 +358,10 @@ void FilesystemVerifierAction::StartPartitionHashing() { offset_ = 0; filesystem_data_end_ = partition_size_; - CHECK_LE(partition.hash_tree_offset, partition.fec_offset) - << " Hash tree is expected to come before FEC data"; + if (partition.fec_offset > 0) { + CHECK_LE(partition.hash_tree_offset, partition.fec_offset) + << " Hash tree is expected to come before FEC data"; + } if (partition.hash_tree_offset != 0) { filesystem_data_end_ = partition.hash_tree_offset; } else if (partition.fec_offset != 0) { |