MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More saftey checks and improvements

Browse Source
This commit is contained in:
topjohnwu 2019-03-07 21:49:47 -05:00
parent 1287372f5a
commit bbd014ad1b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,13 +364,12 @@ void repack(const char* orig_image, const char* out_image) {
// header // header
if (access(HEADER_FILE, R_OK) == 0) { if (access(HEADER_FILE, R_OK) == 0) {
int os_version = 0;
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") {
boot.hdr.page_size() = parse_int(value); boot.hdr.page_size() = parse_int(value);
} else if (key == "name") { } else if (key == "name") {
memset(boot.hdr.name(), 0, 16); memset(boot.hdr.name(), 0, 16);
memcpy(boot.hdr.name(), value.data(), value.length() + 1); memcpy(boot.hdr.name(), value.data(), value.length() > 15 ? 15 : value.length());
} else if (key == "cmdline") { } else if (key == "cmdline") {
memset(boot.hdr.cmdline(), 0, 512); memset(boot.hdr.cmdline(), 0, 512);
memset(boot.hdr.extra_cmdline(), 0, 1024); memset(boot.hdr.extra_cmdline(), 0, 1024);
@ -378,22 +377,22 @@ void repack(const char* orig_image, const char* out_image) {
memcpy(boot.hdr.cmdline(), value.data(), 512); memcpy(boot.hdr.cmdline(), value.data(), 512);
memcpy(boot.hdr.extra_cmdline(), &value[512], value.length() - 511); memcpy(boot.hdr.extra_cmdline(), &value[512], value.length() - 511);
} else { } else {
memcpy(boot.hdr.cmdline(), value.data(), value.length() + 1); memcpy(boot.hdr.cmdline(), value.data(), value.length());
} }
} else if (key == "os_version") { } else if (key == "os_version") {
int patch_level = boot.hdr.os_version() & 0x7ff;
int a, b, c; int a, b, c;
sscanf(value.data(), "%d.%d.%d", &a, &b, &c); sscanf(value.data(), "%d.%d.%d", &a, &b, &c);
os_version |= ((a << 14) | (b << 7) | c) << 11; boot.hdr.os_version() = (((a << 14) | (b << 7) | c) << 11) | patch_level;
} else if (key == "patch_level") { } else if (key == "patch_level") {
int os_version = boot.hdr.os_version() >> 11;
int y, m; int y, m;
sscanf(value.data(), "%d-%d", &y, &m); sscanf(value.data(), "%d-%d", &y, &m);
y -= 2000; y -= 2000;
os_version |= (y << 4) | m; boot.hdr.os_version() = (os_version << 11) | (y << 4) | m;
} }
return true; return true;
}); });
if (os_version)
boot.hdr.os_version() = os_version;
} }
// Skip a page for header // Skip a page for header