Merge pull request #4153 from ogniK5377/prepo-multibuf

prepo: : Don't read extra buffer from report unless passed
2020-06-30 22:37:13 -04:00
parent 424540d9e8 2f0b322e72
commit c6b0353c4d
1 changed files with 6 additions and 1 deletions
--- a/src/core/hle/service/prepo/prepo.cpp
+++ b/src/core/hle/service/prepo/prepo.cpp
@@ -75,8 +75,13 @@ private:
        const auto user_id = rp.PopRaw<u128>();
        const auto process_id = rp.PopRaw<u64>();
        std::vector<std::vector<u8>> data{ctx.ReadBuffer(0)};
+
        if constexpr (Type == Core::Reporter::PlayReportType::Old2) {
-            data.emplace_back(ctx.ReadBuffer(1));
+            const auto read_buffer_count =
+                ctx.BufferDescriptorX().size() + ctx.BufferDescriptorA().size();
+            if (read_buffer_count > 1) {
+                data.emplace_back(ctx.ReadBuffer(1));
+            }
        }

        LOG_DEBUG(