Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to catch low space on game crypto and CIA build operations

Browse Source
This commit is contained in:
d0k3 2017-12-28 03:46:57 +01:00
parent 28ba5a85b3
commit b5a0f6cfcf
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arm9/source/utils/gameutil.c
View File

@ -756,6 +756,17 @@ u32 CryptNcchNcsdBossFirmFile(const char* orig, const char* dest, u32 mode, u16
if (fsize < offset) return 1; if (fsize < offset) return 1;
if (!size) size = fsize - offset; if (!size) size = fsize - offset;
// ensure free space in destination
if (!inplace) {
if ((fvx_lseek(dfp, offset + size) != FR_OK) ||
(fvx_tell(dfp) != offset + size) ||
(fvx_lseek(dfp, offset) != FR_OK)) {
fvx_close(ofp);
fvx_close(dfp);
return 1;
}
}
u32 ret = 0; u32 ret = 0;
if (!ShowProgress(offset, fsize, dest)) ret = 1; if (!ShowProgress(offset, fsize, dest)) ret = 1;
if (mode & (GAME_NCCH|GAME_NCSD|GAME_BOSS|SYS_FIRM|GAME_NDS)) { // for NCCH / NCSD / BOSS / FIRM files if (mode & (GAME_NCCH|GAME_NCSD|GAME_BOSS|SYS_FIRM|GAME_NDS)) { // for NCCH / NCSD / BOSS / FIRM files
@ -1048,6 +1059,16 @@ u32 InsertCiaContent(const char* path_cia, const char* path_content, u32 offset,
return 1; return 1;
} }
// ensure free space for destination file
UINT offset_dest = fvx_tell(&dfile);
if ((fvx_lseek(&dfile, offset_dest + fsize) != FR_OK) ||
(fvx_tell(&dfile) != offset_dest + fsize) ||
(fvx_lseek(&dfile, offset_dest) != FR_OK)) {
fvx_close(&ofile);
fvx_close(&dfile);
return 1;
}
// check if NCCH crypto is available // check if NCCH crypto is available
if (ncch_decrypt) { if (ncch_decrypt) {
NcchHeader ncch; NcchHeader ncch;
@ -1404,8 +1425,10 @@ u32 DumpCxiSrlFromTmdFile(const char* path) {
(GetTmdContentPath(path_cxi, path) != 0) || (GetTmdContentPath(path_cxi, path) != 0) ||
(!((filetype = IdentifyFileType(path_cxi)) & (GAME_NCCH|GAME_NDS))) || (!((filetype = IdentifyFileType(path_cxi)) & (GAME_NCCH|GAME_NDS))) ||
(GetGoodName(dname, path_cxi, false) != 0) || (GetGoodName(dname, path_cxi, false) != 0) ||
(CryptNcchNcsdBossFirmFile(path_cxi, dest, filetype, CRYPTO_DECRYPT, 0, 0, NULL, NULL) != 0)) (CryptNcchNcsdBossFirmFile(path_cxi, dest, filetype, CRYPTO_DECRYPT, 0, 0, NULL, NULL) != 0)) {
if (*dname) fvx_unlink(dest);
return 1; return 1;
}
return 0; return 0;
} }