Browse Source

Merge pull request #6143 from lat9nq/nvhost_null_memcpy

nvhost_ctrl_gpu: Avoid sending null pointer to memcpy
nce_cpp
bunnei 5 years ago
committed by GitHub
parent
commit
d95f1ee25d
  1. 6
      src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp

6
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(&params, input.data(), input.size());
// TODO(ogniK): What does this even actually do?
// 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(), &params, output.size());
}
return NvResult::Success;
}

Loading…
Cancel
Save