H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prepo: Fix BufferDescriptorX invalid buffer errors and add "New" variants of SaveReport

Browse Source 
The second input buffer could be optional when prepo/srepo is called, test for the availability of the second buffer prior to reading from it.
This commit is contained in:
Morph 2021-01-28 01:23:29 -05:00
parent 008afa5d59
commit ae6b3bdfbf
1 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/core/hle/service/prepo/prepo.cpp
View File

@ -23,8 +23,8 @@ public:
{10101, &PlayReport::SaveReportWithUser<Core::Reporter::PlayReportType::Old>, "SaveReportWithUserOld"}, {10101, &PlayReport::SaveReportWithUser<Core::Reporter::PlayReportType::Old>, "SaveReportWithUserOld"},
{10102, &PlayReport::SaveReport<Core::Reporter::PlayReportType::Old2>, "SaveReportOld2"}, {10102, &PlayReport::SaveReport<Core::Reporter::PlayReportType::Old2>, "SaveReportOld2"},
{10103, &PlayReport::SaveReportWithUser<Core::Reporter::PlayReportType::Old2>, "SaveReportWithUserOld2"}, {10103, &PlayReport::SaveReportWithUser<Core::Reporter::PlayReportType::Old2>, "SaveReportWithUserOld2"},
{10104, nullptr, "SaveReport"}, {10104, &PlayReport::SaveReport<Core::Reporter::PlayReportType::New>, "SaveReport"},
{10105, nullptr, "SaveReportWithUser"}, {10105, &PlayReport::SaveReportWithUser<Core::Reporter::PlayReportType::New>, "SaveReportWithUser"},
{10200, nullptr, "RequestImmediateTransmission"}, {10200, nullptr, "RequestImmediateTransmission"},
{10300, nullptr, "GetTransmissionStatus"}, {10300, nullptr, "GetTransmissionStatus"},
{10400, nullptr, "GetSystemSessionId"}, {10400, nullptr, "GetSystemSessionId"},
@ -59,16 +59,22 @@ private:
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto process_id = rp.PopRaw<u64>(); const auto process_id = rp.PopRaw<u64>();
std::vector<std::vector<u8>> data{ctx.ReadBuffer(0)}; const auto data1 = ctx.ReadBuffer(0);
if constexpr (Type == Core::Reporter::PlayReportType::Old2) { const auto data2 = [ctx] {
data.emplace_back(ctx.ReadBuffer(1)); if (ctx.CanReadBuffer(1)) {
return ctx.ReadBuffer(1);
} }
LOG_DEBUG(Service_PREPO, "called, type={:02X}, process_id={:016X}, data1_size={:016X}", return std::vector<u8>{};
Type, process_id, data[0].size()); }();
LOG_DEBUG(Service_PREPO,
"called, type={:02X}, process_id={:016X}, data1_size={:016X}, data2_size={:016X}",
Type, process_id, data1.size(), data2.size());
const auto& reporter{system.GetReporter()}; const auto& reporter{system.GetReporter()};
reporter.SavePlayReport(Type, system.CurrentProcess()->GetTitleID(), data, process_id); reporter.SavePlayReport(Type, system.CurrentProcess()->GetTitleID(), {data1, data2},
process_id);
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
@ -79,24 +85,24 @@ private:
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto user_id = rp.PopRaw<u128>(); const auto user_id = rp.PopRaw<u128>();
const auto process_id = rp.PopRaw<u64>(); const auto process_id = rp.PopRaw<u64>();
std::vector<std::vector<u8>> data{ctx.ReadBuffer(0)};
if constexpr (Type == Core::Reporter::PlayReportType::Old2) { const auto data1 = ctx.ReadBuffer(0);
const auto read_buffer_count = const auto data2 = [ctx] {
ctx.BufferDescriptorX().size() + ctx.BufferDescriptorA().size(); if (ctx.CanReadBuffer(1)) {
if (read_buffer_count > 1) { return ctx.ReadBuffer(1);
data.emplace_back(ctx.ReadBuffer(1));
}
} }
LOG_DEBUG( return std::vector<u8>{};
Service_PREPO, }();
"called, type={:02X}, user_id={:016X}{:016X}, process_id={:016X}, data1_size={:016X}",
Type, user_id[1], user_id[0], process_id, data[0].size()); LOG_DEBUG(Service_PREPO,
"called, type={:02X}, user_id={:016X}{:016X}, process_id={:016X}, "
"data1_size={:016X}, data2_size={:016X}",
Type, user_id[1], user_id[0], process_id, data1.size(), data2.size());
const auto& reporter{system.GetReporter()}; const auto& reporter{system.GetReporter()};
reporter.SavePlayReport(Type, system.CurrentProcess()->GetTitleID(), data, process_id, reporter.SavePlayReport(Type, system.CurrentProcess()->GetTitleID(), {data1, data2},
user_id); process_id, user_id);
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
@ -107,7 +113,13 @@ private:
const auto title_id = rp.PopRaw<u64>(); const auto title_id = rp.PopRaw<u64>();
const auto data1 = ctx.ReadBuffer(0); const auto data1 = ctx.ReadBuffer(0);
const auto data2 = ctx.ReadBuffer(1); const auto data2 = [ctx] {
if (ctx.CanReadBuffer(1)) {
return ctx.ReadBuffer(1);
}
return std::vector<u8>{};
}();
LOG_DEBUG(Service_PREPO, "called, title_id={:016X}, data1_size={:016X}, data2_size={:016X}", LOG_DEBUG(Service_PREPO, "called, title_id={:016X}, data1_size={:016X}, data2_size={:016X}",
title_id, data1.size(), data2.size()); title_id, data1.size(), data2.size());
@ -125,7 +137,13 @@ private:
const auto title_id = rp.PopRaw<u64>(); const auto title_id = rp.PopRaw<u64>();
const auto data1 = ctx.ReadBuffer(0); const auto data1 = ctx.ReadBuffer(0);
const auto data2 = ctx.ReadBuffer(1); const auto data2 = [ctx] {
if (ctx.CanReadBuffer(1)) {
return ctx.ReadBuffer(1);
}
return std::vector<u8>{};
}();
LOG_DEBUG(Service_PREPO, LOG_DEBUG(Service_PREPO,
"called, user_id={:016X}{:016X}, title_id={:016X}, data1_size={:016X}, " "called, user_id={:016X}{:016X}, title_id={:016X}, data1_size={:016X}, "