Merge pull request #9718 from yuzu-emu/revert-9508-hle-ipc-buffer-span

Revert "hle_ipc: Use std::span to avoid heap allocations/copies when calling ReadBuffer"

1 files changed, 6 insertions, 3 deletions

diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp
index cab44bf9c..fbb16a7da 100644
--- a/src/core/hle/service/filesystem/fsp_srv.cpp
+++ b/src/core/hle/service/filesystem/fsp_srv.cpp
@@ -190,7 +190,7 @@ private:
             return;
         }
 
-        const auto data = ctx.ReadBuffer();
+        const std::vector<u8> data = ctx.ReadBuffer();
 
         ASSERT_MSG(
             static_cast<s64>(data.size()) <= length,
@@ -401,8 +401,11 @@ public:
     }
 
     void RenameFile(Kernel::HLERequestContext& ctx) {
-        const std::string src_name = Common::StringFromBuffer(ctx.ReadBuffer(0));
-        const std::string dst_name = Common::StringFromBuffer(ctx.ReadBuffer(1));
+        std::vector<u8> buffer = ctx.ReadBuffer(0);
+        const std::string src_name = Common::StringFromBuffer(buffer);
+
+        buffer = ctx.ReadBuffer(1);
+        const std::string dst_name = Common::StringFromBuffer(buffer);
 
         LOG_DEBUG(Service_FS, "called. file '{}' to file '{}'", src_name, dst_name);