| commit | d6f53a601a50a16af80e31115109da399d959baf | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Fri Apr 02 21:49:58 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 02 21:49:58 2021 +0000 |
| tree | ad073317d32336fa9a39e8632a51a414234d43fd | |
| parent | df3a22e54bb1a8ef834c45b8c6853415125de7e6 [diff] | |
| parent | f22fa83e8e037a81d14246aa99bfca365c50fe9e [diff] |
Fix a potential wild pointer error when markSlotSuccessful comes late am: 65e8b6c195 am: f22fa83e8e Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1663460 Change-Id: I3f166238a920086316de1b5ab4eac7775ba87b41
diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc index b447509..ae2727a 100644 --- a/aosp/cleanup_previous_update_action.cc +++ b/aosp/cleanup_previous_update_action.cc
@@ -207,6 +207,7 @@ if (!kIsRecovery && !boot_control_->IsSlotMarkedSuccessful(boot_control_->GetCurrentSlot())) { ScheduleWaitMarkBootSuccessful(); + return; } if (metadata_device_ == nullptr) {