archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix (harmless) Cycles ASAN warnings

Browse Source
This commit is contained in:
Brecht Van Lommel
2019-06-21 16:24:56 +02:00
parent a887e1ea43
commit 19488ee125
5 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
intern/cycles/util/util_array.h
View File

@@ -63,7 +63,9 @@ template<typename T, size_t alignment = MIN_ALIGNMENT_CPU_DATA_TYPES> class arra
}
else {
data_ = mem_allocate(from.datasize_);
memcpy(data_, from.data_, from.datasize_ * sizeof(T));
if (from.datasize_ > 0) {
memcpy(data_, from.data_, from.datasize_ * sizeof(T));
}
datasize_ = from.datasize_;
capacity_ = datasize_;
}
@@ -73,7 +75,9 @@ template<typename T, size_t alignment = MIN_ALIGNMENT_CPU_DATA_TYPES> class arra
{
if (this != &from) {
resize(from.size());
memcpy((void *)data_, from.data_, datasize_ * sizeof(T));
if (datasize_ > 0) {
memcpy((void *)data_, from.data_, datasize_ * sizeof(T));
}
}
return *this;
@@ -83,7 +87,7 @@ template<typename T, size_t alignment = MIN_ALIGNMENT_CPU_DATA_TYPES> class arra
{
resize(from.size());
if (from.size() > 0) {
if (from.size() > 0 && datasize_ > 0) {
memcpy(data_, &from[0], datasize_ * sizeof(T));
}
@@ -100,6 +104,9 @@ template<typename T, size_t alignment = MIN_ALIGNMENT_CPU_DATA_TYPES> class arra
if (datasize_ != other.datasize_) {
return false;
}
if (datasize_ == 0) {
return true;
}
return memcmp(data_, other.data_, datasize_ * sizeof(T)) == 0;
}