mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Defect 169256. Needed to set the reference count and flags values of a FlmRecord object to zero during a call to allocCell().

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@353 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-04-25 21:11:50 +00:00
parent b7ed55322f
commit 266ab9b809
3 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
flaim/src/frec.cpp
View File

@@ -86,6 +86,7 @@ FlmRecord::~FlmRecord()
gv_FlmSysData.RCacheMgr.pRecBufAlloc->freeBuf(
m_uiBufferSize, &m_pucBuffer);
}
if( m_pucFieldIdTable)
{
flmAssert( *((FlmRecord **)m_pucFieldIdTable) == this);
@@ -4631,6 +4632,21 @@ void * FlmRecord::locateFieldByPosition(
return (getFieldVoid( pField));
}
/****************************************************************************
Desc:
****************************************************************************/
void FlmRecord::objectAllocInit(
void * pvAlloc)
{
// Need to make sure that m_refCnt and m_uiFlags are initialized to zero
// prior to unlocking the mutex. This is so the FLAIM allocator
// doesn't see garbage values that may cause it to relocate the object
// before the constructor has been called.
((FlmRecord *)pvAlloc)->m_uiFlags = 0;
((FlmRecord *)pvAlloc)->m_refCnt = 0;
}
#undef new
#undef delete
@@ -4645,7 +4661,7 @@ void * FlmRecord::operator new(
{
F_UNREFERENCED_PARM( uiSize);
flmAssert( gv_FlmSysData.RCacheMgr.pRecAlloc->getCellSize() >= uiSize);
return( gv_FlmSysData.RCacheMgr.pRecAlloc->allocCell());
return( gv_FlmSysData.RCacheMgr.pRecAlloc->allocCell( objectAllocInit));
}
/****************************************************************************
@@ -4673,7 +4689,7 @@ void * FlmRecord::operator new(
#endif
{
flmAssert( gv_FlmSysData.RCacheMgr.pRecAlloc->getCellSize() >= uiSize);
return( gv_FlmSysData.RCacheMgr.pRecAlloc->allocCell());
return( gv_FlmSysData.RCacheMgr.pRecAlloc->allocCell( objectAllocInit));
}
#endif