| commit | 0cc0f876f6c414b4bea6620ab36e28bcb110006b | [log] [tgz] |
|---|---|---|
| author | Daniel Zheng <zhengdaniel@google.com> | Tue Mar 07 20:02:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 07 20:02:54 2023 +0000 |
| tree | 106e142c18a909f43a6a48b01acddcacc1df6395 | |
| parent | cc5cfbc7b244c353a344da1791b65ff920b52444 [diff] | |
| parent | 0583240c61f158d8e7a433b2052756aaf58547fe [diff] |
Fixed infinite loop inside verity write and --disable_fec_computation am: 701cb6f654 am: 0583240c61 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/2467467 Change-Id: I1c39e6c4b05a74395bddbc8ca8a475859a125b39 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/payload_consumer/verity_writer_android.cc b/payload_consumer/verity_writer_android.cc index 31d2875..4a476d2 100644 --- a/payload_consumer/verity_writer_android.cc +++ b/payload_consumer/verity_writer_android.cc
@@ -151,6 +151,9 @@ } double IncrementalEncodeFEC::ReportProgress() const { + if (num_rounds_ == 0) { + return 1.0; + } return static_cast<double>(current_round_) / num_rounds_; } @@ -311,7 +314,8 @@ return true; } bool VerityWriterAndroid::FECFinished() const { - if (encodeFEC_.Finished()) { + if ((encodeFEC_.Finished() || partition_->fec_size == 0) && + hash_tree_written_) { return true; } return false;