diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-04-02 21:08:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-02 21:08:37 +0000 |
| commit | f22fa83e8e037a81d14246aa99bfca365c50fe9e (patch) | |
| tree | ad073317d32336fa9a39e8632a51a414234d43fd | |
| parent | 33c243559723d8a62acf8484de0b3bb2b66765cb (diff) | |
| parent | 65e8b6c19582f196dfab67d12cc3af78bb8d138c (diff) | |
| download | update_engine-f22fa83e8e037a81d14246aa99bfca365c50fe9e.tar.gz | |
Fix a potential wild pointer error when markSlotSuccessful comes late am: 65e8b6c195
Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1663460
Change-Id: I0b546ac44a9a22db414367cc9f066d878302e10a
| -rw-r--r-- | aosp/cleanup_previous_update_action.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/aosp/cleanup_previous_update_action.cc b/aosp/cleanup_previous_update_action.cc index b4475098..ae2727a8 100644 --- a/aosp/cleanup_previous_update_action.cc +++ b/aosp/cleanup_previous_update_action.cc @@ -207,6 +207,7 @@ void CleanupPreviousUpdateAction::CheckSlotMarkedSuccessfulOrSchedule() { if (!kIsRecovery && !boot_control_->IsSlotMarkedSuccessful(boot_control_->GetCurrentSlot())) { ScheduleWaitMarkBootSuccessful(); + return; } if (metadata_device_ == nullptr) { |