Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UMRs.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@183924 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com 2005-11-02 16:04:24 +00:00
parent 377273f5e6
commit 264d8d10cd
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/xpcom/glue/nsVoidArray.cpp
View File

@ -73,6 +73,7 @@ nsVoidArray::nsVoidArray(PRInt32 aCount)
char* bytes = new char[sizeof(Impl) + sizeof(void*) * (aCount - 1)];
mImpl = NS_REINTERPRET_CAST(Impl*, bytes);
if (mImpl) {
mImpl->mBits = 0;
SetArraySize(aCount);
mImpl->mCount = aCount;
nsCRT::memset(mImpl->mArray, 0, mImpl->mCount * sizeof(void*));
@ -91,6 +92,7 @@ nsVoidArray& nsVoidArray::operator=(const nsVoidArray& other)
char* bytes = new char[sizeof(Impl) + sizeof(void*) * (otherCount - 1)];
mImpl = NS_REINTERPRET_CAST(Impl*, bytes);
if (mImpl) {
mImpl->mBits = 0;
SetArraySize(otherCount);
mImpl->mCount = otherCount;
SetArrayOwner(PR_TRUE);
@ -172,6 +174,7 @@ PRBool nsVoidArray::InsertElementAt(void* aElement, PRInt32 aIndex)
delete[] NS_REINTERPRET_CAST(char*, mImpl);
mImpl = newImpl;
mImpl->mBits = 0;
SetArraySize(newCount);
mImpl->mCount = oldCount;
SetArrayOwner(PR_TRUE);
@ -214,6 +217,7 @@ PRBool nsVoidArray::ReplaceElementAt(void* aElement, PRInt32 aIndex)
delete[] NS_REINTERPRET_CAST(char*, mImpl);
mImpl = newImpl;
mImpl->mBits = 0;
SetArraySize(newCount);
mImpl->mCount = oldCount;
SetArrayOwner(PR_TRUE);
@ -283,6 +287,7 @@ void nsVoidArray::Compact()
nsCRT::memcpy(newImpl->mArray, mImpl->mArray, count * sizeof(void*));
mImpl = newImpl;
mImpl->mBits = 0;
SetArraySize(count);
mImpl->mCount = count;
SetArrayOwner(PR_TRUE);
@ -329,10 +334,11 @@ nsAutoVoidArray::nsAutoVoidArray()
: nsVoidArray()
{
mImpl = NS_REINTERPRET_CAST(Impl*, mAutoBuf);
mImpl->mCount = 0;
::memset(mImpl->mArray, 0, mImpl->mCount * sizeof(void*));
mImpl->mBits = 0;
SetArraySize(kAutoBufSize);
mImpl->mCount = 0;
SetArrayOwner(PR_FALSE);
::memset(mImpl->mArray, 0, mImpl->mCount * sizeof(void*));
}
//----------------------------------------------------------------