summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Burgess IV <gbiv@google.com>2019-10-24 02:36:04 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-10-24 02:36:04 +0200
commit67cce21e5d970b7a71a8318f94f0e8fd3a3a71ee (patch)
tree271a8a2f73079b4d2c438cfdea0d6d68ce4b0e29
parentSkip QD1A.190821.011 in stage-aosp-master am: a5d835720a (diff)
parentMerge "bootable: leak less memory" am: 19073f2067 (diff)
downloadandroid_bootable_recovery-67cce21e5d970b7a71a8318f94f0e8fd3a3a71ee.tar
android_bootable_recovery-67cce21e5d970b7a71a8318f94f0e8fd3a3a71ee.tar.gz
android_bootable_recovery-67cce21e5d970b7a71a8318f94f0e8fd3a3a71ee.tar.bz2
android_bootable_recovery-67cce21e5d970b7a71a8318f94f0e8fd3a3a71ee.tar.lz
android_bootable_recovery-67cce21e5d970b7a71a8318f94f0e8fd3a3a71ee.tar.xz
android_bootable_recovery-67cce21e5d970b7a71a8318f94f0e8fd3a3a71ee.tar.zst
android_bootable_recovery-67cce21e5d970b7a71a8318f94f0e8fd3a3a71ee.zip
-rw-r--r--boot_control/libboot_control.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/boot_control/libboot_control.cpp b/boot_control/libboot_control.cpp
index e3bff9ff3..ff4eaabfa 100644
--- a/boot_control/libboot_control.cpp
+++ b/boot_control/libboot_control.cpp
@@ -218,7 +218,8 @@ bool BootControl::Init() {
}
// Note that since there isn't a module unload function this memory is leaked.
- misc_device_ = strdup(device.c_str());
+ // We use `device` below sometimes, so it's not moved out of here.
+ misc_device_ = device;
initialized_ = true;
// Validate the loaded data, otherwise we will destroy it and re-initialize it