Archive/citra
0
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-04-28 19:17:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 6f18e6a39f into 864414f8fd

Browse source
This commit is contained in:
R-YaTian 2024-10-29 05:48:22 -07:00 • committed by GitHub
commit aa35df4d39
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/core/hle/service/am/am.cpp
View file

@ -45,6 +45,7 @@ constexpr u16 CATEGORY_DLP = 0x0001;
constexpr u8 VARIATION_SYSTEM = 0x02; constexpr u8 VARIATION_SYSTEM = 0x02;
constexpr u32 TID_HIGH_UPDATE = 0x0004000E; constexpr u32 TID_HIGH_UPDATE = 0x0004000E;
constexpr u32 TID_HIGH_DLC = 0x0004008C; constexpr u32 TID_HIGH_DLC = 0x0004008C;
constexpr u16 MAX_CONTENT_COUNT = 255;
struct TitleInfo { struct TitleInfo {
u64_le tid; u64_le tid;
@ -194,6 +195,8 @@ Result CIAFile::WriteTitleMetadata() {
// TODO: Correct error code. // TODO: Correct error code.
return FileSys::ResultFileNotFound; return FileSys::ResultFileNotFound;
} }
if (content_count > MAX_CONTENT_COUNT)
file.Close();
} }
if (container.GetTitleMetadata().HasEncryptedContent()) { if (container.GetTitleMetadata().HasEncryptedContent()) {
@ -244,6 +247,11 @@ ResultVal<std::size_t> CIAFile::WriteContentData(u64 offset, std::size_t length,
// to get the content paths to write to. // to get the content paths to write to.
FileSys::TitleMetadata tmd = container.GetTitleMetadata(); FileSys::TitleMetadata tmd = container.GetTitleMetadata();
auto& file = content_files[i]; auto& file = content_files[i];
if (content_written.size() > MAX_CONTENT_COUNT) {
auto path = GetTitleContentPath(media_type, tmd.GetTitleID(), i, is_update);
FileUtil::IOFile fp(path, "ab+");
file = std::move(fp);
}
std::vector<u8> temp(buffer + (range_min - offset), std::vector<u8> temp(buffer + (range_min - offset),
buffer + (range_min - offset) + available_to_write); buffer + (range_min - offset) + available_to_write);
@ -259,6 +267,9 @@ ResultVal<std::size_t> CIAFile::WriteContentData(u64 offset, std::size_t length,
content_written[i] += available_to_write; content_written[i] += available_to_write;
LOG_DEBUG(Service_AM, "Wrote {:x} to content {}, total {:x}", available_to_write, i, LOG_DEBUG(Service_AM, "Wrote {:x} to content {}, total {:x}", available_to_write, i,
content_written[i]); content_written[i]);
if (content_written.size() > MAX_CONTENT_COUNT) {
file.Close();
}
} }
} }