franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

service/acc: Early return in failure case in LoadImage() 

Allows unindenting the other branch's code.
This commit is contained in:
Lioncash 2018-10-24 15:03:29 -04:00
parent 77e705a8fa
commit 3ec90dc6ef
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/service/acc/acc.cpp
View File

@ -104,13 +104,14 @@ private:
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
const FileUtil::IOFile image(GetImagePath(user_id), "rb"); const FileUtil::IOFile image(GetImagePath(user_id), "rb");
if (!image.IsOpen()) { if (!image.IsOpen()) {
LOG_WARNING(Service_ACC, LOG_WARNING(Service_ACC,
"Failed to load user provided image! Falling back to built-in backup..."); "Failed to load user provided image! Falling back to built-in backup...");
ctx.WriteBuffer(backup_jpeg); ctx.WriteBuffer(backup_jpeg);
rb.Push<u32>(backup_jpeg_size); rb.Push<u32>(backup_jpeg_size);
} else { return;
}
const auto size = std::min<u32>(image.GetSize(), MAX_JPEG_IMAGE_SIZE); const auto size = std::min<u32>(image.GetSize(), MAX_JPEG_IMAGE_SIZE);
std::vector<u8> buffer(size); std::vector<u8> buffer(size);
image.ReadBytes(buffer.data(), buffer.size()); image.ReadBytes(buffer.data(), buffer.size());
@ -118,7 +119,6 @@ private:
ctx.WriteBuffer(buffer.data(), buffer.size()); ctx.WriteBuffer(buffer.data(), buffer.size());
rb.Push<u32>(buffer.size()); rb.Push<u32>(buffer.size());
} }
}
void GetImageSize(Kernel::HLERequestContext& ctx) { void GetImageSize(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_ACC, "called"); LOG_DEBUG(Service_ACC, "called");