portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

librz/bin: fix MTK image parsing on BE host (#6580)

Browse source 
Co-authored-by: Anton Kochkov <anton.kochkov@gmail.com>
This commit is contained in:
NOT XVilka 2026-06-30 14:52:32 +08:00 committed by GitHub
parent 1306a965ec
commit 402e0fc1b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
librz/bin/format/mtk/mtk.c
View file

@ -30,11 +30,13 @@ static ut64 mtk_find_gfh(RzBuffer *b) {
for (ut64 off = 0; off + MTK_GFH_MIN_FILE_SIZE <= limit; off += 4) { for (ut64 off = 0; off + MTK_GFH_MIN_FILE_SIZE <= limit; off += 4) {
ut64 cursor = off; ut64 cursor = off;
MtkGfhCommonHdr hdr = { 0 }; MtkGfhCommonHdr hdr = { 0 };
ut16 type = 0;
if (!rz_buf_read_le32_offset(b, &cursor, &hdr.magic_version) || if (!rz_buf_read_le32_offset(b, &cursor, &hdr.magic_version) ||
!rz_buf_read_le16_offset(b, &cursor, &hdr.size) || !rz_buf_read_le16_offset(b, &cursor, &hdr.size) ||
!rz_buf_read_le16_offset(b, &cursor, (ut16 *)&hdr.type)) { !rz_buf_read_le16_offset(b, &cursor, &type)) {
continue; continue;
} }
hdr.type = type;
if (mtk_is_gfh_magic(hdr.magic_version) && if (mtk_is_gfh_magic(hdr.magic_version) &&
hdr.type == MTK_GFH_TYPE_FILE_INFO && hdr.type == MTK_GFH_TYPE_FILE_INFO &&
hdr.size >= MTK_GFH_MIN_FILE_SIZE) { hdr.size >= MTK_GFH_MIN_FILE_SIZE) {
@ -45,9 +47,14 @@ static ut64 mtk_find_gfh(RzBuffer *b) {
} }
static bool mtk_read_common_hdr(RzBuffer *b, ut64 *offset, MtkGfhCommonHdr *hdr) { static bool mtk_read_common_hdr(RzBuffer *b, ut64 *offset, MtkGfhCommonHdr *hdr) {
return rz_buf_read_le32_offset(b, offset, &hdr->magic_version) && ut16 type = 0;
rz_buf_read_le16_offset(b, offset, &hdr->size) && if (!(rz_buf_read_le32_offset(b, offset, &hdr->magic_version) &&
rz_buf_read_le16_offset(b, offset, (ut16 *)&hdr->type); rz_buf_read_le16_offset(b, offset, &hdr->size) &&
rz_buf_read_le16_offset(b, offset, &type))) {
return false;
}
hdr->type = type;
return true;
} }
static bool mtk_read_file_info(RzBuffer *b, ut64 *offset, MtkGfhFileInfo *fi) { static bool mtk_read_file_info(RzBuffer *b, ut64 *offset, MtkGfhFileInfo *fi) {