diff options
author | bunnei <bunneidev@gmail.com> | 2021-04-08 01:50:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-08 01:50:22 +0200 |
commit | 262a70223f0ef9a7cce2f8106e70401fba477e19 (patch) | |
tree | 4d225ed6a11ea0984387a973d47793729264c5f8 /src/core/hle/service/nvdrv | |
parent | Merge pull request #6159 from Morph1984/acc-update-12.x (diff) | |
parent | nvhost_ctrl_gpu: Avoid sending null pointer to memcpy (diff) | |
download | yuzu-262a70223f0ef9a7cce2f8106e70401fba477e19.tar yuzu-262a70223f0ef9a7cce2f8106e70401fba477e19.tar.gz yuzu-262a70223f0ef9a7cce2f8106e70401fba477e19.tar.bz2 yuzu-262a70223f0ef9a7cce2f8106e70401fba477e19.tar.lz yuzu-262a70223f0ef9a7cce2f8106e70401fba477e19.tar.xz yuzu-262a70223f0ef9a7cce2f8106e70401fba477e19.tar.zst yuzu-262a70223f0ef9a7cce2f8106e70401fba477e19.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp index 933d42f3f..2edd803f3 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp @@ -248,7 +248,13 @@ NvResult nvhost_ctrl_gpu::ZBCSetTable(const std::vector<u8>& input, std::vector< IoctlZbcSetTable params{}; std::memcpy(¶ms, input.data(), input.size()); // TODO(ogniK): What does this even actually do? - std::memcpy(output.data(), ¶ms, output.size()); + + // Prevent null pointer being passed as arg 1 + if (output.empty()) { + LOG_WARNING(Service_NVDRV, "Avoiding passing null pointer to memcpy"); + } else { + std::memcpy(output.data(), ¶ms, output.size()); + } return NvResult::Success; } |