i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only free the old buffer if we owned it and set owning flag.

Browse Source 
* If we cloned the buffer due to misalignment, only free the old buffer
  if we actually own it (i.e. if it was allocated by us).
* Set the KMESSAGE_OWNS_BUFFER flag after cloning the buffer. Previously
  the buffer was leaked in the clone case.
This commit is contained in:
Michael Lotz
2011-12-10 18:46:29 +01:00
parent d0aa07489c
commit 9a87646122
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/messaging/KMessage.cpp
+2 -1
View File
@@ -836,11 +836,12 @@ KMessage::_InitFromBuffer(bool sizeFromBuffer)
memcpy(buffer, fBuffer, fBufferCapacity); memcpy(buffer, fBuffer, fBufferCapacity);
if ((fFlags & KMESSAGE_CLONE_BUFFER) == 0) if ((fFlags & KMESSAGE_OWNS_BUFFER) != 0)
free(fBuffer); free(fBuffer);
fBuffer = buffer; fBuffer = buffer;
fFlags &= ~(uint32)(KMESSAGE_READ_ONLY | KMESSAGE_CLONE_BUFFER); fFlags &= ~(uint32)(KMESSAGE_READ_ONLY | KMESSAGE_CLONE_BUFFER);
fFlags |= KMESSAGE_OWNS_BUFFER;
} }
if (_Align(fBuffer) != fBuffer) if (_Align(fBuffer) != fBuffer)