citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

NCCH: Updated ExeFS memory allocation to be safer.

This commit is contained in:
bunnei 2014-07-04 20:32:06 -04:00
parent 542700ccb7
commit b70c4fb48e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/loader/loader.h
View File

@ -32,6 +32,7 @@ enum class ResultStatus {
ErrorNotLoaded, ErrorNotLoaded,
ErrorNotUsed, ErrorNotUsed,
ErrorAlreadyLoaded, ErrorAlreadyLoaded,
ErrorMemoryAllocationFailed,
}; };
/// Interface for loading an application /// Interface for loading an application

7
src/core/loader/ncch.cpp
View File

@ -157,7 +157,12 @@ ResultStatus AppLoader_NCCH::LoadSectionExeFS(const char* name, std::vector<u8>&
// Section is compressed... // Section is compressed...
if (i == 0 && is_compressed) { if (i == 0 && is_compressed) {
// Read compressed .code section... // Read compressed .code section...
std::unique_ptr<u8[]> temp_buffer(new u8[exefs_header.section[i].size]); std::unique_ptr<u8[]> temp_buffer;
try {
temp_buffer.reset(new u8[exefs_header.section[i].size]);
} catch (std::bad_alloc&) {
return ResultStatus::ErrorMemoryAllocationFailed;
}
file.ReadBytes(&temp_buffer[0], exefs_header.section[i].size); file.ReadBytes(&temp_buffer[0], exefs_header.section[i].size);
// Decompress .code section... // Decompress .code section...