AuroraSupport/AuroraRuntime
2
1
Fork 0
Code Issues 27 Pull Requests Releases Wiki Activity

[+] AuByteBuffer::flagNoRealloc

Browse Source 
[*] Fix IO regression / Critical Bug / Leak and stupid double free
This commit is contained in:
Reece Wilson 2023-10-29 20:36:11 +00:00
parent 59b30e47c0
commit 087bac4085
6 changed files with 80 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Include/Aurora/Memory/ByteBuffer.hpp
View File

@ -79,6 +79,7 @@ namespace Aurora::Memory
AuUInt8 flagReadError : 1 {};
AuUInt8 flagWriteError : 1 {};
AuUInt8 flagNoFree : 1 {};
AuUInt8 flagNoRealloc: 1 {};
AuUInt8 flagAlwaysExpandable : 1 {}; // it's a long story from how we got from string views to std::vector<std::uint8_t>s to current day AuByteBuffer.
// anyway long story short, if you want a buffered api to write into us linearly and grow, enable me.
// if you just want ::Write and similar functions to work keem me false and enable flagExpandable.
@ -277,7 +278,7 @@ namespace Aurora::Memory
inline ~ByteBuffer()
{
if (this->base)
if (this->base && !this->flagNoFree)
{
Free(this->base);
}

15
Include/Aurora/Memory/ByteBuffer_Memory.inl
View File

@ -11,7 +11,8 @@ namespace Aurora::Memory
{
bool ByteBuffer::Allocate(AuUInt length)
{
if (this->flagNoFree)
if (this->flagNoFree ||
this->flagNoRealloc)
{
return false;
}
@ -45,7 +46,8 @@ namespace Aurora::Memory
bool ByteBuffer::Allocate(AuUInt length, AuUInt alignment)
{
if (this->flagNoFree)
if (this->flagNoFree ||
this->flagNoRealloc)
{
return false;
}
@ -80,7 +82,8 @@ namespace Aurora::Memory
bool ByteBuffer::SetBuffer(MemoryViewRead readView, bool bMoveWriteHeadForReaders)
{
if (this->flagNoFree)
if (this->flagNoFree ||
this->flagNoRealloc)
{
return false;
}
@ -134,7 +137,8 @@ namespace Aurora::Memory
void ByteBuffer::GC()
{
if (this->flagNoFree)
if (this->flagNoFree ||
this->flagNoRealloc)
{
return;
}
@ -182,7 +186,8 @@ namespace Aurora::Memory
bool ByteBuffer::Resize(AuUInt length)
{
if (this->flagNoFree)
if (this->flagNoFree ||
this->flagNoRealloc)
{
return false;
}

153
Source/IO/Net/AuNetSocketChannel.cpp
View File

@ -552,6 +552,15 @@ namespace Aurora::IO::Net
this->inputChannel.pNetReader.reset();
}
static bool ForceResize(AuByteBuffer &buffer, AuUInt uLength)
{
auto old = buffer.flagNoRealloc;
buffer.flagNoRealloc = false;
bool bRet = buffer.Resize(uLength);
buffer.flagNoRealloc = old;
return bRet;
}
void SocketChannel::DoBufferResizeOnThread(bool bInput,
bool bOutput,
AuUInt uBytes,
@ -577,49 +586,30 @@ namespace Aurora::IO::Net
return;
}
bool bHasCurrentSuccess {};
if (bOutput)
{
if (this->outputChannel.CanResize())
{
AuByteBuffer newBuffer(uBytes, false, false);
if (!(newBuffer.IsValid()))
if (ForceResize(this->outputChannel.GetByteBuffer(), uBytes))
{
SysPushErrorMemory();
if (pCallbackOptional)
{
pCallbackOptional->OnFailure((void *)nullptr);
}
return;
bOutput = false;
bHasCurrentSuccess = !bInput;
}
auto &byteBufferRef = this->outputChannel.GetByteBuffer();
auto oldReadHead = byteBufferRef.readPtr;
if (!newBuffer.WriteFrom(byteBufferRef))
{
SysPushErrorMemory();
this->outputChannel.GetByteBuffer().readPtr = oldReadHead;
if (pCallbackOptional)
{
pCallbackOptional->OnFailure((void *)nullptr);
}
return;
}
byteBufferRef = AuMove(newBuffer);
if (pCallbackOptional)
{
pCallbackOptional->OnSuccess((void *)nullptr);
}
return;
}
}
if (bHasCurrentSuccess)
{
if (pCallbackOptional)
{
pCallbackOptional->OnSuccess((void *)nullptr);
}
return;
}
{
AU_LOCK_GUARD(this->spinLock);
@ -627,22 +617,31 @@ namespace Aurora::IO::Net
{
if (this->uBytesOutputBufferRetarget)
{
if (this->pRetargetOutput)
if (auto pOutput = AuExchange(this->pRetargetOutput, {}))
{
this->pRetargetOutput->OnFailure((void *)nullptr);
pOutput->OnFailure((void *)nullptr);
if (this->pRetargetInput == pOutput)
{
this->pRetargetInput = {};
}
}
}
this->uBytesOutputBufferRetarget = uBytes;
this->pRetargetOutput = pCallbackOptional;
}
else
if (bInput)
{
if (this->uBytesInputBufferRetarget)
{
if (this->pRetargetInput)
if (auto pInput = AuExchange(this->pRetargetInput, {}))
{
this->pRetargetInput->OnFailure((void *)nullptr);
pInput->OnFailure((void *)nullptr);
if (this->pRetargetOutput == pInput)
{
this->pRetargetOutput = {};
}
}
}
@ -661,43 +660,29 @@ namespace Aurora::IO::Net
return;
}
AuByteBuffer newBuffer(this->uBytesOutputBufferRetarget, true, false);
if (!(newBuffer.IsValid()))
{
SysPushErrorMemory();
if (this->pRetargetOutput)
{
this->pRetargetOutput->OnFailure((void *)nullptr);
}
return;
}
auto &byteBufferRef = this->outputChannel.GetByteBuffer();
auto oldReadHead = byteBufferRef.readPtr;
auto oldWriteHead = byteBufferRef.writePtr;
if (!newBuffer.WriteFrom(byteBufferRef))
if (!ForceResize(this->outputChannel.GetByteBuffer(), uBytesOutputBufferRetarget))
{
SysPushErrorMemory();
this->outputChannel.GetByteBuffer().readPtr = oldReadHead;
this->outputChannel.GetByteBuffer().writePtr = oldWriteHead;
if (this->pRetargetOutput)
if (auto pOutput = AuExchange(this->pRetargetOutput, {}))
{
this->pRetargetOutput->OnFailure((void *)nullptr);
pOutput->OnFailure((void *)nullptr);
if (this->pRetargetInput == pOutput)
{
this->pRetargetInput = {};
}
}
return;
}
byteBufferRef = AuMove(newBuffer);
this->uBytesOutputBufferRetarget = 0;
if (this->pRetargetOutput)
if (auto pOutput = AuExchange(this->pRetargetOutput, {}))
{
this->pRetargetOutput->OnSuccess((void *)nullptr);
if (this->pRetargetInput != pOutput)
{
pOutput->OnSuccess((void *)nullptr);
}
}
}
@ -710,43 +695,31 @@ namespace Aurora::IO::Net
return;
}
AuByteBuffer newBuffer(this->uBytesInputBufferRetarget, true, false);
if (!(newBuffer.IsValid()))
{
SysPushErrorMemory();
if (this->pRetargetInput)
{
this->pRetargetInput->OnFailure((void *)nullptr);
}
return;
}
auto byteBufferRef = this->inputChannel.AsReadableByteBuffer();
auto oldReadHead = byteBufferRef->readPtr;
auto oldWriteHead = byteBufferRef->writePtr;
if (!newBuffer.WriteFrom(*byteBufferRef.get()))
if (!ForceResize(*this->inputChannel.AsReadableByteBuffer(), uBytesOutputBufferRetarget))
{
SysPushErrorMemory();
byteBufferRef->readPtr = oldReadHead;
byteBufferRef->writePtr = oldWriteHead;
if (this->pRetargetInput)
if (auto pInput = AuExchange(this->pRetargetInput, {}))
{
this->pRetargetInput->OnFailure((void *)nullptr);
pInput->OnFailure((void *)nullptr);
if (this->pRetargetOutput == pInput)
{
this->pRetargetOutput = {};
}
}
return;
}
byteBufferRef.get()->operator=(AuMove(newBuffer));
this->uBytesInputBufferRetarget = 0;
if (this->pRetargetInput)
if (auto pInput = AuExchange(this->pRetargetInput, {}))
{
this->pRetargetInput->OnSuccess((void *)nullptr);
if (this->pRetargetOutput != pInput)
{
pInput->OnSuccess((void *)nullptr);
}
}
}

1
Source/IO/Net/AuNetSocketChannelOutput.cpp
View File

@ -27,6 +27,7 @@ namespace Aurora::IO::Net
outputBuffer_(kDefaultBufferSize, true)
{
this->outputWriteQueue_.pBase = pParent;
this->outputBuffer_.flagNoRealloc = true;
}
bool SocketChannelOutput::IsValid()

4
Source/IO/Protocol/AuProtocolPiece.cpp
View File

@ -77,11 +77,11 @@ namespace Aurora::IO::Protocol
}
}
this->outputBuffer.flagNoFree = false;
this->outputBuffer.flagNoRealloc = false;
auto bRet = this->outputBuffer.Resize(uOutputLength);
if (!this->uMax.has_value())
{
this->outputBuffer.flagNoFree = true;
this->outputBuffer.flagNoRealloc = true;
}
return bRet;
}

4
Source/IO/Protocol/AuProtocolStack.cpp
View File

@ -120,7 +120,7 @@ namespace Aurora::IO::Protocol
return {};
}
pNew->outputBuffer.flagNoFree = true;
pNew->outputBuffer.flagNoRealloc = true;
// Circular ref
pNew->pOuputWriter = AuMakeShared<AuIO::Buffered::BlobWriter>(AuSPtr<Memory::ByteBuffer>(pNew, &pNew->outputBuffer));
@ -266,7 +266,7 @@ namespace Aurora::IO::Protocol
}
else
{
pNew->outputBuffer.flagNoFree = true;
pNew->outputBuffer.flagNoRealloc = true;
}
pNew->uStartingSize = uOutputBufferSize;