wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1059813: Protect access to fields of |UnixSocketRawData|, r=qdot

Browse Source 
This patch adds protection for fields of |UnixSocketRawData| by
making them private.
This commit is contained in:
Thomas Zimmermann 2014-09-03 16:43:14 +02:00
parent 34164819fa
commit 9e49329aab
2 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ipc/unixsocket/SocketBase.cpp
View File

@ -18,17 +18,9 @@ namespace ipc {
// UnixSocketRawData
//
UnixSocketRawData::UnixSocketRawData(size_t aSize)
: mSize(0)
, mCurrentWriteOffset(0)
, mAvailableSpace(aSize)
{
mData = new uint8_t[mAvailableSpace];
}
UnixSocketRawData::UnixSocketRawData(const void* aData, size_t aSize)
: mSize(aSize)
, mCurrentWriteOffset(0)
, mOffset(0)
, mAvailableSpace(aSize)
{
MOZ_ASSERT(aData || !mSize);
@ -37,6 +29,14 @@ UnixSocketRawData::UnixSocketRawData(const void* aData, size_t aSize)
memcpy(mData, aData, mSize);
}
UnixSocketRawData::UnixSocketRawData(size_t aSize)
: mSize(0)
, mOffset(0)
, mAvailableSpace(aSize)
{
mData = new uint8_t[mAvailableSpace];
}
nsresult
UnixSocketRawData::Receive(int aFd)
{
@ -50,7 +50,7 @@ UnixSocketRawData::Receive(int aFd)
} else {
memmove(mData, GetData(), GetSize());
}
mCurrentWriteOffset = 0;
mOffset = 0;
}
ssize_t res =
@ -195,7 +195,7 @@ SocketIOBase::~SocketIOBase()
void
SocketIOBase::EnqueueData(UnixSocketRawData* aData)
{
if (!aData->mSize) {
if (!aData->GetSize()) {
delete aData; // delete empty data immediately
return;
}

33
ipc/unixsocket/SocketBase.h
View File

@ -29,29 +29,23 @@ namespace ipc {
class UnixSocketRawData
{
public:
// Number of octets in mData.
size_t mSize;
size_t mCurrentWriteOffset;
nsAutoArrayPtr<uint8_t> mData;
/**
* Constructor for situations where only size is known beforehand
* (for example, when being assigned strings)
*/
UnixSocketRawData(size_t aSize);
/**
* Constructor for situations where size and data is known
* beforehand (for example, when being assigned strings)
/* This constructor copies aData of aSize bytes length into the
* new instance of |UnixSocketRawData|.
*/
UnixSocketRawData(const void* aData, size_t aSize);
/* This constructor reserves aSize bytes of space. Currently
* it's only possible to fill this buffer by calling |Receive|.
*/
UnixSocketRawData(size_t aSize);
nsresult Receive(int aFd);
nsresult Send(int aFd);
const uint8_t* GetData() const
{
return mData + mCurrentWriteOffset;
return mData + mOffset;
}
size_t GetSize() const
@ -64,18 +58,18 @@ public:
MOZ_ASSERT(aSize <= mSize);
mSize -= aSize;
mCurrentWriteOffset += aSize;
mOffset += aSize;
}
protected:
size_t GetLeadingSpace() const
{
return mCurrentWriteOffset;
return mOffset;
}
size_t GetTrailingSpace() const
{
return mAvailableSpace - (mCurrentWriteOffset + mSize);
return mAvailableSpace - (mOffset + mSize);
}
size_t GetAvailableSpace() const
@ -85,11 +79,14 @@ protected:
void* GetTrailingBytes()
{
return mData + mCurrentWriteOffset + mSize;
return mData + mOffset + mSize;
}
private:
size_t mSize;
size_t mOffset;
size_t mAvailableSpace;
nsAutoArrayPtr<uint8_t> mData;
};
enum SocketConnectionStatus {