Snap for 7236705 from a0e4c16c6b048ada37b259712ad710785858d2a3 to sc-release

Change-Id: I9f3a1ca40ad263b292626aeb2edd23f4503cfd37

1 files changed, 5 insertions, 3 deletions

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index f720ddaa4..c946ba95e 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -523,10 +523,12 @@ static std::vector<char> LoadBootableImage(const std::string& kernel, const std:
     fprintf(stderr,"creating boot image...\n");
 
     std::vector<char> out;
-    boot_img_hdr_v2* boot_image_data = mkbootimg(kernel_data, ramdisk_data, second_stage_data,
-                                                 dtb_data, g_base_addr, g_boot_img_hdr, &out);
+    mkbootimg(kernel_data, ramdisk_data, second_stage_data, dtb_data, g_base_addr, g_boot_img_hdr,
+              &out);
 
-    if (!g_cmdline.empty()) bootimg_set_cmdline(boot_image_data, g_cmdline);
+    if (!g_cmdline.empty()) {
+        bootimg_set_cmdline(reinterpret_cast<boot_img_hdr_v2*>(out.data()), g_cmdline);
+    }
     fprintf(stderr, "creating boot image - %zu bytes\n", out.size());
     return out;
 }