Merge "app: aboot: allocate memory for cmdline_final instead of dst_buf"
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
old mode 100755
new mode 100644
index 8a32762..5d036f5
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -328,11 +328,13 @@
if (cmdline_len > 0) {
const char *src;
- unsigned char *dst = (unsigned char*) malloc((cmdline_len + 4) & (~3));
- ASSERT(dst != NULL);
+ unsigned char *dst;
+
+ cmdline_final = (unsigned char*) malloc((cmdline_len + 4) & (~3));
+ ASSERT(cmdline_final != NULL);
+ dst = cmdline_final;
/* Save start ptr for debug print */
- cmdline_final = dst;
if (have_cmdline) {
src = cmdline;
while ((*dst++ = *src++));
@@ -592,6 +594,7 @@
generate_atags(tags, final_cmdline, ramdisk, ramdisk_size);
#endif
+ free(final_cmdline);
/* Perform target specific cleanup */
target_uninit();