TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-21 12:18:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure boot_img is initialized correctly

Browse Source
This commit is contained in:
topjohnwu 2018-10-22 01:58:50 -04:00
parent c2b016370b
commit 018c0064cd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
native/jni/magiskboot/bootimg.cpp
View File

@ -252,7 +252,7 @@ void boot_img::print_hdr() {
} }
int unpack(const char *image) { int unpack(const char *image) {
boot_img boot; boot_img boot = boot_img();
int ret = boot.parse_image(image); int ret = boot.parse_image(image);
int fd; int fd;
@ -290,7 +290,7 @@ int unpack(const char *image) {
#define file_align() write_zero(fd, align_off(lseek(fd, 0, SEEK_CUR) - header_off, boot.page_size())) #define file_align() write_zero(fd, align_off(lseek(fd, 0, SEEK_CUR) - header_off, boot.page_size()))
void repack(const char* orig_image, const char* out_image) { void repack(const char* orig_image, const char* out_image) {
boot_img boot; boot_img boot = boot_img();
off_t header_off, kernel_off, ramdisk_off, second_off, extra_off; off_t header_off, kernel_off, ramdisk_off, second_off, extra_off;
@ -399,7 +399,7 @@ void repack(const char* orig_image, const char* out_image) {
// Map output image as rw // Map output image as rw
munmap(boot.map_addr, boot.map_size); munmap(boot.map_addr, boot.map_size);
mmap_rw(out_image, reinterpret_cast<void **>(&boot.map_addr), &boot.map_size); mmap_rw(out_image, (void **) &boot.map_addr, &boot.map_size);
// MTK headers // MTK headers
if (boot.flags & MTK_KERNEL) { if (boot.flags & MTK_KERNEL) {