Skip to content

Commit 1bbca0b

Browse files
committed
fix load linux in simulator
1 parent 3ff4da1 commit 1bbca0b

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

backend/droidboot_dualboot_backend.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,16 @@ void droidboot_boot_linux_from_ext4(struct boot_entry *entry)
9393
}
9494
droidboot_log(DROIDBOOT_LOG_TRACE, "ramdisk get size ok\n");
9595
if(droidboot_get_ramdisk_load_addr()==NULL){
96-
ramdisk_raw = malloc(ramdisk_size);
9796
if(droidboot_append_ramdisk_to_kernel())
9897
{
98+
if(droidboot_get_kernel_load_addr()==NULL) {
99+
droidboot_log(DROIDBOOT_LOG_TRACE, "cannot append ramdisk to null kernel\n");
100+
return;
101+
}
99102
ramdisk_raw = kernel_raw+kernel_raw_size;
100-
}
103+
} else {
104+
ramdisk_raw = malloc(ramdisk_size);
105+
}
101106
} else {
102107
droidboot_log(DROIDBOOT_LOG_INFO, "loading ramdisk at addr %d\n", droidboot_get_ramdisk_load_addr());
103108
ramdisk_raw = droidboot_get_ramdisk_load_addr();

droidboot_platforms

0 commit comments

Comments
 (0)