From 182f1ebe4327fff8a5ebfd84b8ef6c7dead7c4b7 Mon Sep 17 00:00:00 2001 From: d0k3 Date: Mon, 9 Mar 2020 22:52:45 +0100 Subject: [PATCH] Fix garbage data in converted CIAs Partial fix for #587 --- arm9/source/utils/gameutil.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/arm9/source/utils/gameutil.c b/arm9/source/utils/gameutil.c index 8fd2569..38934ff 100644 --- a/arm9/source/utils/gameutil.c +++ b/arm9/source/utils/gameutil.c @@ -188,12 +188,13 @@ u32 LoadNcchMeta(CiaMeta* meta, const char* path, u64 offset) { } u32 LoadTmdFile(TitleMetaData* tmd, const char* path) { - UINT br; - - // full TMD file - if ((fvx_qread(path, tmd, 0, TMD_SIZE_MAX, &br) != FR_OK) || - (br < TMD_SIZE_MIN) || (ValidateTmd(tmd) != 0) || - (br < TMD_SIZE_N(getbe16(tmd->content_count)))) + // first part (TMD only) (we need to read the content count first) + if ((fvx_qread(path, tmd, 0, TMD_SIZE_MIN, NULL) != FR_OK) || + (ValidateTmd(tmd) != 0)) + return 1; + + // second part (read full size) + if (fvx_qread(path, tmd, 0, TMD_SIZE_N(getbe16(tmd->content_count)), NULL) != FR_OK) return 1; return 0;