ash/Anemone3DS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #64 from saibotu/pr-bgmcrash

Browse Source 
Fixed crash when installing themes without bgm
This commit is contained in:
Nils P
2017-09-06 17:03:51 +02:00
committed by GitHub
parent 3fd4548d64 379cea8db1
commit 897dc52424
3 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/fs.h
View File

@@ -39,7 +39,7 @@ Result close_archives(void);
u64 file_to_buf(FS_Path path, FS_Archive archive, char** buf); u64 file_to_buf(FS_Path path, FS_Archive archive, char** buf);
u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf); u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf);
u32 buf_to_file(u32 size, char *path, FS_Archive archive, char *buf); Result buf_to_file(u32 size, char *path, FS_Archive archive, char *buf);
void remake_file(char *path, FS_Archive archive, u32 size); void remake_file(char *path, FS_Archive archive, u32 size);
#endif #endif

7
source/fs.c
View File

@@ -151,17 +151,16 @@ u32 zip_file_to_buf(char *file_name, u16 *zip_path, char **buf)
} }
} }
u32 buf_to_file(u32 size, char *path, FS_Archive archive, char *buf) Result buf_to_file(u32 size, char *path, FS_Archive archive, char *buf)
{ {
Handle handle; Handle handle;
u32 bytes = 0;
Result res = FSUSER_OpenFile(&handle, archive, fsMakePath(PATH_ASCII, path), FS_OPEN_WRITE, 0); Result res = FSUSER_OpenFile(&handle, archive, fsMakePath(PATH_ASCII, path), FS_OPEN_WRITE, 0);
if (R_FAILED(res)) return res; if (R_FAILED(res)) return res;
res = FSFILE_Write(handle, &bytes, 0, buf, size, FS_WRITE_FLUSH); res = FSFILE_Write(handle, NULL, 0, buf, size, FS_WRITE_FLUSH);
if (R_FAILED(res)) return res; if (R_FAILED(res)) return res;
res = FSFILE_Close(handle); res = FSFILE_Close(handle);
if (R_FAILED(res)) return res; if (R_FAILED(res)) return res;
return bytes; return 0;
} }
void remake_file(char *path, FS_Archive archive, u32 size) void remake_file(char *path, FS_Archive archive, u32 size)

38
source/themes.c
View File

@@ -230,9 +230,11 @@ Result bgm_install(Theme_s bgm_to_install)
memset(&savedata_buf[0x13b8], 0, 8); memset(&savedata_buf[0x13b8], 0, 8);
savedata_buf[0x13bd] = 3; savedata_buf[0x13bd] = 3;
savedata_buf[0x13b8] = 0xff; savedata_buf[0x13b8] = 0xff;
u32 size = buf_to_file(savedata_size, "/SaveData.dat", ArchiveHomeExt, savedata_buf); Result result = buf_to_file(savedata_size, "/SaveData.dat", ArchiveHomeExt, savedata_buf);
free(savedata_buf); free(savedata_buf);
if (!R_SUCCEEDED(result)) return result;
if (bgm_to_install.is_zip) // Same as above but this time with bgm if (bgm_to_install.is_zip) // Same as above but this time with bgm
{ {
music_size = zip_file_to_buf("bgm.bcstm", bgm_to_install.path, &music); music_size = zip_file_to_buf("bgm.bcstm", bgm_to_install.path, &music);
@@ -245,7 +247,6 @@ Result bgm_install(Theme_s bgm_to_install)
if (music_size == 0) if (music_size == 0)
{ {
free(music);
music = calloc(1, 3371008); music = calloc(1, 3371008);
} else if (music_size > 3371008) { } else if (music_size > 3371008) {
free(music); free(music);
@@ -253,10 +254,10 @@ Result bgm_install(Theme_s bgm_to_install)
return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_TOO_LARGE); return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_TOO_LARGE);
} }
size = buf_to_file(music_size, "/BgmCache.bin", ArchiveThemeExt, music); result = buf_to_file(music_size == 0 ? 3371008 : music_size, "/BgmCache.bin", ArchiveThemeExt, music);
free(music); free(music);
if (size == 0) return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND); if (!R_SUCCEEDED(result)) return result;
file_to_buf(fsMakePath(PATH_ASCII, "/ThemeManage.bin"), ArchiveThemeExt, &thememanage_buf); file_to_buf(fsMakePath(PATH_ASCII, "/ThemeManage.bin"), ArchiveThemeExt, &thememanage_buf);
thememanage_buf[0x00] = 1; thememanage_buf[0x00] = 1;
@@ -280,9 +281,11 @@ Result bgm_install(Theme_s bgm_to_install)
memset(&thememanage_buf[0x340], 0, 4); memset(&thememanage_buf[0x340], 0, 4);
memset(&thememanage_buf[0x360], 0, 4); memset(&thememanage_buf[0x360], 0, 4);
memset(&thememanage_buf[0x368], 0, 4); memset(&thememanage_buf[0x368], 0, 4);
size = buf_to_file(0x800, "/ThemeManage.bin", ArchiveThemeExt, thememanage_buf); result = buf_to_file(0x800, "/ThemeManage.bin", ArchiveThemeExt, thememanage_buf);
free(thememanage_buf); free(thememanage_buf);
if (!R_SUCCEEDED(result)) return result;
return 0; return 0;
} }
@@ -302,9 +305,11 @@ Result single_install(Theme_s theme_to_install)
memset(&savedata_buf[0x13b8], 0, 8); memset(&savedata_buf[0x13b8], 0, 8);
savedata_buf[0x13bd] = 3; savedata_buf[0x13bd] = 3;
savedata_buf[0x13b8] = 0xff; savedata_buf[0x13b8] = 0xff;
u32 size = buf_to_file(savedata_size, "/SaveData.dat", ArchiveHomeExt, savedata_buf); Result result = buf_to_file(savedata_size, "/SaveData.dat", ArchiveHomeExt, savedata_buf);
free(savedata_buf); free(savedata_buf);
if (!R_SUCCEEDED(result)) return result;
// Open body cache file. Test if theme is zipped // Open body cache file. Test if theme is zipped
if (theme_to_install.is_zip) if (theme_to_install.is_zip)
{ {
@@ -325,10 +330,10 @@ Result single_install(Theme_s theme_to_install)
return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND); return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND);
} }
size = buf_to_file(body_size, "/BodyCache.bin", ArchiveThemeExt, body); // Write body data to file result = buf_to_file(body_size, "/BodyCache.bin", ArchiveThemeExt, body); // Write body data to file
free(body); free(body);
if (size == 0) return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND); if (!R_SUCCEEDED(result)) return result;
if (theme_to_install.is_zip) // Same as above but this time with bgm if (theme_to_install.is_zip) // Same as above but this time with bgm
{ {
@@ -342,7 +347,6 @@ Result single_install(Theme_s theme_to_install)
if (music_size == 0) if (music_size == 0)
{ {
free(music);
music = calloc(1, 3371008); music = calloc(1, 3371008);
} else if (music_size > 3371008) { } else if (music_size > 3371008) {
free(music); free(music);
@@ -350,10 +354,10 @@ Result single_install(Theme_s theme_to_install)
return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_TOO_LARGE); return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_TOO_LARGE);
} }
size = buf_to_file(music_size, "/BgmCache.bin", ArchiveThemeExt, music); result = buf_to_file(music_size == 0 ? 3371008 : music_size, "/BgmCache.bin", ArchiveThemeExt, music);
free(music); free(music);
if (size == 0) return MAKERESULT(RL_PERMANENT, RS_CANCELED, RM_APPLICATION, RD_NOT_FOUND); if (!R_SUCCEEDED(result)) return result;
file_to_buf(fsMakePath(PATH_ASCII, "/ThemeManage.bin"), ArchiveThemeExt, &thememanage_buf); file_to_buf(fsMakePath(PATH_ASCII, "/ThemeManage.bin"), ArchiveThemeExt, &thememanage_buf);
thememanage_buf[0x00] = 1; thememanage_buf[0x00] = 1;
@@ -379,9 +383,11 @@ Result single_install(Theme_s theme_to_install)
memset(&thememanage_buf[0x340], 0, 4); memset(&thememanage_buf[0x340], 0, 4);
memset(&thememanage_buf[0x360], 0, 4); memset(&thememanage_buf[0x360], 0, 4);
memset(&thememanage_buf[0x368], 0, 4); memset(&thememanage_buf[0x368], 0, 4);
size = buf_to_file(0x800, "/ThemeManage.bin", ArchiveThemeExt, thememanage_buf); result = buf_to_file(0x800, "/ThemeManage.bin", ArchiveThemeExt, thememanage_buf);
free(thememanage_buf); free(thememanage_buf);
if (!R_SUCCEEDED(result)) return result;
return 0; return 0;
} }
@@ -427,9 +433,11 @@ Result shuffle_install(Theme_s *themes_list, int theme_count)
} }
} }
buf_to_file(size, "/SaveData.dat", ArchiveHomeExt, savedata_buf); Result result = buf_to_file(size, "/SaveData.dat", ArchiveHomeExt, savedata_buf);
free(savedata_buf); free(savedata_buf);
if (!R_SUCCEEDED(result)) return result;
remake_file("/BodyCache_rd.bin", ArchiveThemeExt, 0x150000 * 10); // Enough space for 10 theme files remake_file("/BodyCache_rd.bin", ArchiveThemeExt, 0x150000 * 10); // Enough space for 10 theme files
Handle body_cache_handle; Handle body_cache_handle;
FSUSER_OpenFile(&body_cache_handle, ArchiveThemeExt, fsMakePath(PATH_ASCII, "/BodyCache_rd.bin"), FS_OPEN_WRITE, 0); FSUSER_OpenFile(&body_cache_handle, ArchiveThemeExt, fsMakePath(PATH_ASCII, "/BodyCache_rd.bin"), FS_OPEN_WRITE, 0);
@@ -526,8 +534,10 @@ Result shuffle_install(Theme_s *themes_list, int theme_count)
*bgmsizeloc = bgm_sizes[i]; *bgmsizeloc = bgm_sizes[i];
} }
buf_to_file(0x800, "/ThemeManage.bin", ArchiveThemeExt, thememanage_buf); result = buf_to_file(0x800, "/ThemeManage.bin", ArchiveThemeExt, thememanage_buf);
free(thememanage_buf); free(thememanage_buf);
if (!R_SUCCEEDED(result)) return result;
return MAKERESULT(RL_SUCCESS, RS_SUCCESS, RM_COMMON, RD_SUCCESS); return MAKERESULT(RL_SUCCESS, RS_SUCCESS, RM_COMMON, RD_SUCCESS);
} }