artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

service/acc: Silence compiler warnings

Browse source 
Silences compiler warnings related to truncation. This also introduces a
small helper function to perform the clamping of the image size.
This commit is contained in:
Lioncash 2018-10-24 15:25:30 -04:00
parent 3ec90dc6ef
commit 6f00628564
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/hle/service/acc/acc.cpp
View file

@ -21,8 +21,6 @@
namespace Service::Account { namespace Service::Account {
constexpr u32 MAX_JPEG_IMAGE_SIZE = 0x20000;
// TODO: RE this structure // TODO: RE this structure
struct UserData { struct UserData {
INSERT_PADDING_WORDS(1); INSERT_PADDING_WORDS(1);
@ -39,6 +37,11 @@ static std::string GetImagePath(UUID uuid) {
"/system/save/8000000000000010/su/avators/" + uuid.FormatSwitch() + ".jpg"; "/system/save/8000000000000010/su/avators/" + uuid.FormatSwitch() + ".jpg";
} }
static constexpr u32 SanitizeJPEGSize(std::size_t size) {
constexpr std::size_t max_jpeg_image_size = 0x20000;
return static_cast<u32>(std::min(size, max_jpeg_image_size));
}
class IProfile final : public ServiceFramework<IProfile> { class IProfile final : public ServiceFramework<IProfile> {
public: public:
explicit IProfile(UUID user_id, ProfileManager& profile_manager) explicit IProfile(UUID user_id, ProfileManager& profile_manager)
@ -112,12 +115,12 @@ private:
return; return;
} }
const auto size = std::min<u32>(image.GetSize(), MAX_JPEG_IMAGE_SIZE); const u32 size = SanitizeJPEGSize(image.GetSize());
std::vector<u8> buffer(size); std::vector<u8> buffer(size);
image.ReadBytes(buffer.data(), buffer.size()); image.ReadBytes(buffer.data(), buffer.size());
ctx.WriteBuffer(buffer.data(), buffer.size()); ctx.WriteBuffer(buffer.data(), buffer.size());
rb.Push<u32>(buffer.size()); rb.Push<u32>(size);
} }
void GetImageSize(Kernel::HLERequestContext& ctx) { void GetImageSize(Kernel::HLERequestContext& ctx) {
@ -133,7 +136,7 @@ private:
"Failed to load user provided image! Falling back to built-in backup..."); "Failed to load user provided image! Falling back to built-in backup...");
rb.Push<u32>(backup_jpeg_size); rb.Push<u32>(backup_jpeg_size);
} else { } else {
rb.Push<u32>(std::min<u32>(image.GetSize(), MAX_JPEG_IMAGE_SIZE)); rb.Push<u32>(SanitizeJPEGSize(image.GetSize()));
} }
} }