mirror of
https://github.com/starr-dusT/yuzu-mainline
synced 2024-03-05 21:12:25 -08:00
Merge pull request #6145 from lat9nq/nvhost_empty_memcpy
nvhost_nvdec_common: Avoid memcpy with null pointers
This commit is contained in:
commit
dfac2e2d25
@ -23,18 +23,23 @@ namespace {
|
|||||||
template <typename T>
|
template <typename T>
|
||||||
std::size_t SpliceVectors(const std::vector<u8>& input, std::vector<T>& dst, std::size_t count,
|
std::size_t SpliceVectors(const std::vector<u8>& input, std::vector<T>& dst, std::size_t count,
|
||||||
std::size_t offset) {
|
std::size_t offset) {
|
||||||
|
if (!dst.empty()) {
|
||||||
std::memcpy(dst.data(), input.data() + offset, count * sizeof(T));
|
std::memcpy(dst.data(), input.data() + offset, count * sizeof(T));
|
||||||
offset += count * sizeof(T);
|
}
|
||||||
return offset;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write vectors will write data to the output buffer
|
// Write vectors will write data to the output buffer
|
||||||
template <typename T>
|
template <typename T>
|
||||||
std::size_t WriteVectors(std::vector<u8>& dst, const std::vector<T>& src, std::size_t offset) {
|
std::size_t WriteVectors(std::vector<u8>& dst, const std::vector<T>& src, std::size_t offset) {
|
||||||
|
if (src.empty()) {
|
||||||
|
return 0;
|
||||||
|
} else {
|
||||||
std::memcpy(dst.data() + offset, src.data(), src.size() * sizeof(T));
|
std::memcpy(dst.data() + offset, src.data(), src.size() * sizeof(T));
|
||||||
offset += src.size() * sizeof(T);
|
offset += src.size() * sizeof(T);
|
||||||
return offset;
|
return offset;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} // Anonymous namespace
|
} // Anonymous namespace
|
||||||
|
|
||||||
nvhost_nvdec_common::nvhost_nvdec_common(Core::System& system, std::shared_ptr<nvmap> nvmap_dev,
|
nvhost_nvdec_common::nvhost_nvdec_common(Core::System& system, std::shared_ptr<nvmap> nvmap_dev,
|
||||||
|
Loading…
Reference in New Issue
Block a user