TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-22 16:07:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Header v3 does not have name entry

Browse Source
This commit is contained in:
topjohnwu 2020-11-20 22:52:09 -08:00
parent 1385d2a4f4
commit 552ec1eb35
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,8 @@ void dyn_img_hdr::print() {
void dyn_img_hdr::dump_hdr_file() { void dyn_img_hdr::dump_hdr_file() {
FILE *fp = xfopen(HEADER_FILE, "w"); FILE *fp = xfopen(HEADER_FILE, "w");
fprintf(fp, "pagesize=%u\n", page_size()); fprintf(fp, "pagesize=%u\n", page_size());
fprintf(fp, "name=%s\n", name()); if (name())
fprintf(fp, "name=%s\n", name());
fprintf(fp, "cmdline=%.*s%.*s\n", BOOT_ARGS_SIZE, cmdline(), BOOT_EXTRA_ARGS_SIZE, extra_cmdline()); fprintf(fp, "cmdline=%.*s%.*s\n", BOOT_ARGS_SIZE, cmdline(), BOOT_EXTRA_ARGS_SIZE, extra_cmdline());
uint32_t ver = os_version(); uint32_t ver = os_version();
if (ver) { if (ver) {
@ -129,7 +130,7 @@ void dyn_img_hdr::load_hdr_file() {
parse_prop_file(HEADER_FILE, [=](string_view key, string_view value) -> bool { parse_prop_file(HEADER_FILE, [=](string_view key, string_view value) -> bool {
if (key == "page_size") { if (key == "page_size") {
page_size() = parse_int(value); page_size() = parse_int(value);
} else if (key == "name") { } else if (key == "name" && name()) {
memset(name(), 0, 16); memset(name(), 0, 16);
memcpy(name(), value.data(), value.length() > 15 ? 15 : value.length()); memcpy(name(), value.data(), value.length() > 15 ? 15 : value.length());
} else if (key == "cmdline") { } else if (key == "cmdline") {