| commit | db9dbdecd3ab1a0e7780458e2e45c26d4a048ea4 | [log] [tgz] |
|---|---|---|
| author | Kelvin Zhang <zhangkelvin@google.com> | Fri Apr 02 22:37:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 02 22:37:06 2021 +0000 |
| tree | 8c26ca98b9e4e5bd1535df8a66df3371ec646080 | |
| parent | d4a81ab9739ca924b00ef23fd06be091f75b3d95 [diff] | |
| parent | d6f53a601a50a16af80e31115109da399d959baf [diff] |
Fix a potential wild pointer error when markSlotSuccessful comes late am: 65e8b6c195 am: f22fa83e8e am: d6f53a601a Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1663460 Change-Id: Ic7d5e0394bce3e91f0e86e5104d7eec5e424f5c8
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) {