mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ResMgr::TestStack more robust

Browse Source
This commit is contained in:
Lionel Elie Mamane
2012-02-13 17:53:19 +01:00
parent 8eb33ee135
commit bbeb0f7a82
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/source/rc/resmgr.cxx
View File

@@ -1012,18 +1012,29 @@ void ResMgr::TestStack( const Resource* pResObj )
{ {
osl::Guard<osl::Mutex> aGuard( getResMgrMutex() ); osl::Guard<osl::Mutex> aGuard( getResMgrMutex() );
int upperLimit = nCurStack;
if ( upperLimit < 0 )
{
OSL_FAIL( "resource stack underrun!" );
upperLimit = aStack.size() - 1;
}
else if ( upperLimit >= static_cast<int>(aStack.size()) )
{
OSL_FAIL( "stack occupation index > allocated stack size" );
upperLimit = aStack.size() - 1;
}
if ( DbgIsResource() ) if ( DbgIsResource() )
{ {
for( int i = 1; i <= nCurStack; ++i ) for( int i = 1; i <= upperLimit; ++i )
{ {
if ( aStack[i].pResObj == pResObj ) if ( aStack[i].pResObj == pResObj )
{ {
#ifdef DBG_UTIL
RscError_Impl( "Resource not freed! ", this, RscError_Impl( "Resource not freed! ", this,
aStack[i].pResource->GetRT(), aStack[i].pResource->GetRT(),
aStack[i].pResource->GetId(), aStack[i].pResource->GetId(),
aStack, i-1 ); aStack, i-1 );
#endif
} }
} }
} }