Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-17 03:09:47 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix potential nullptrs and off by one

Browse source
This commit is contained in:
Ada 2024-03-08 15:24:21 +00:00
parent cd25e11f8e
commit 68e35d806a
No known key found for this signature in database
GPG key ID: 066E56D5C9F4E50D
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/fs/archive_ext_save_data.cpp
View file

@ -246,7 +246,7 @@ Rust::Result<std::vector<u8>, HorizonResult> ExtSaveDataArchive::loadIcon() cons
const fs::path iconPath = IOFile::getAppData() / backingFolder / "icon"; const fs::path iconPath = IOFile::getAppData() / backingFolder / "icon";
IOFile file(iconPath, "rb"); IOFile file(iconPath, "rb");
const s32 size = static_cast<s32>(file.size().value_or(-1)); const s32 size = static_cast<s32>(file.size().value_or(-1));
if (size < 0) { if (size <= 0) {
return Err(Result::FS::NotFoundInvalid); return Err(Result::FS::NotFoundInvalid);
} }

2
src/core/services/fs.cpp
View file

@ -578,7 +578,7 @@ void FSService::createExtSaveData(u32 messagePointer) {
if (selected != nullptr) { if (selected != nullptr) {
selected->format(path, info); selected->format(path, info);
if (smdhSize > 0) { if (smdhSize > 0 && smdhPointer != 0) {
const FSPath smdh = readPath(PathType::Binary, smdhPointer, smdhSize); const FSPath smdh = readPath(PathType::Binary, smdhPointer, smdhSize);
selected->saveIcon(smdh.binary); selected->saveIcon(smdh.binary);
} }