sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the Buffer-related issue

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-03-23 19:14:11 +01:00
parent ce1f11abec
commit 1ca1e1d443
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/sfizz/Buffer.h
View file

@ -156,8 +156,12 @@ public:
return true; return true;
} }
auto tempSize = newSize + 2 * AlignmentMask; // To ensure that we have leeway at the beginning and at the end Type* oldData = paddedData.get();
auto* newData = std::realloc(paddedData.get(), tempSize * sizeof(value_type)); Type* oldNormalData = normalData;
std::size_t oldSize = alignedSize;
std::size_t tempSize = newSize + 2 * AlignmentMask; // To ensure that we have leeway at the beginning and at the end
Type* newData = reinterpret_cast<Type*>(std::calloc(tempSize, sizeof(value_type)));
if (newData == nullptr) { if (newData == nullptr) {
return false; return false;
} }
@ -173,12 +177,15 @@ public:
paddedData.reset(static_cast<pointer>(newData)); paddedData.reset(static_cast<pointer>(newData));
normalData = static_cast<pointer>(align(Alignment, alignedSize, newData, tempSize)); normalData = static_cast<pointer>(align(Alignment, alignedSize, newData, tempSize));
normalEnd = normalData + alignedSize; normalEnd = normalData + alignedSize;
auto endMisalignment = (alignedSize & TypeAlignmentMask); std::size_t endMisalignment = (alignedSize & TypeAlignmentMask);
if (endMisalignment != 0) if (endMisalignment != 0)
_alignedEnd = normalEnd + Alignment - endMisalignment; _alignedEnd = normalEnd + Alignment - endMisalignment;
else else
_alignedEnd = normalEnd; _alignedEnd = normalEnd;
std::memcpy(normalData, oldNormalData, std::min(newSize, oldSize) * sizeof(Type));
std::free(oldData);
return true; return true;
} }
@ -307,14 +314,14 @@ private:
static_assert(Alignment == 0 || Alignment == 4 || Alignment == 8 || Alignment == 16 || Alignment == 32, "Bad alignment value"); static_assert(Alignment == 0 || Alignment == 4 || Alignment == 8 || Alignment == 16 || Alignment == 32, "Bad alignment value");
static_assert(TypeAlignment * sizeof(value_type) == Alignment || !std::is_arithmetic<value_type>::value, static_assert(TypeAlignment * sizeof(value_type) == Alignment || !std::is_arithmetic<value_type>::value,
"The alignment does not appear to be divided by the size of the arithmetic Type"); "The alignment does not appear to be divided by the size of the arithmetic Type");
void* align(std::size_t alignment, std::size_t size, void *&ptr, std::size_t &space ) void* align(std::size_t alignment, std::size_t size, void *ptr, std::size_t &space)
{ {
std::uintptr_t pn = reinterpret_cast< std::uintptr_t>( ptr ); std::uintptr_t pn = reinterpret_cast<std::uintptr_t>(ptr);
std::uintptr_t aligned = ( pn + alignment - 1 ) & - alignment; std::uintptr_t aligned = (pn + alignment - 1) & - alignment;
std::size_t padding = aligned - pn; std::size_t padding = aligned - pn;
if ( space < size + padding ) return nullptr; if (space < size + padding) return nullptr;
space -= padding; space -= padding;
return ptr = reinterpret_cast< void * >( aligned ); return reinterpret_cast<void *>(aligned);
} }
struct deleter { struct deleter {