Merge "bootable: leak less memory" am: 19073f2

gburgessiv · android-build-merger · commit 5026bd604750 · 2019-10-23T17:29:00.000-07:00
am: 3739574 Change-Id: If49a5e1a2d997346cc1c1fc5a8652eb033a5f1a7
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,8 @@ bool BootControl::Init() {`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`// Note that since there isn't a module unload function this memory is leaked.`
`221`		`- misc_device_ = strdup(device.c_str());`
	`221`	+ // We use `device` below sometimes, so it's not moved out of here.
	`222`	`+ misc_device_ = device;`
`222`	`223`	`initialized_ = true;`
`223`	`224`
`224`	`225`	`// Validate the loaded data, otherwise we will destroy it and re-initialize it`