| commit | f22fa83e8e037a81d14246aa99bfca365c50fe9e | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Fri Apr 02 21:08:37 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 02 21:08:37 2021 +0000 |
| tree | ad073317d32336fa9a39e8632a51a414234d43fd | |
| parent | 33c243559723d8a62acf8484de0b3bb2b66765cb [diff] | |
| parent | 65e8b6c19582f196dfab67d12cc3af78bb8d138c [diff] |
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
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) {