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

Fix for 9963 locking crash

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@39631 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dveditz%netscape.com 1999-07-16 03:16:29 +00:00
parent 9b0c738a22
commit 17413b760d
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/xpinstall/src/nsSoftwareUpdate.cpp
View File

@ -312,32 +312,34 @@ nsSoftwareUpdate::InstallJarCallBack()
nsresult
nsSoftwareUpdate::RunNextInstall()
{
nsresult rv = NS_OK;
nsresult rv = NS_OK;
nsInstallInfo* info = nsnull;
PR_Lock(mLock);
if (!mInstalling)
if (!mInstalling)
{
if ( mJarInstallQueue->GetSize() > 0 )
{
nsInstallInfo *info = (nsInstallInfo*)mJarInstallQueue->Get(0);
info = (nsInstallInfo*)mJarInstallQueue->Get(0);
if ( info )
{
mInstalling = PR_TRUE;
RunInstall( info );
}
else
// XXX leaks any nsInstallInfos left in queue
rv = NS_ERROR_NULL_POINTER;
}
else
{
// nothing more to do
VR_Close();
}
}
else
{
// nothing more to do
VR_Close();
}
PR_Unlock(mLock);
// make sure to RunInstall() outside of locked section due to callbacks
if (info)
RunInstall( info );
return rv;
}

2
mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp
View File

@ -274,7 +274,7 @@ static nsresult SetupInstallContext(const char* jarFile,
///////////////////////////////////////////////////////////////////////////////////////////////
PRInt32 RunInstall(nsInstallInfo *installInfo)
{
if (installInfo->GetFlags() == 0x00000001)
if (installInfo->GetFlags() == 0x0000FFFF) // XXX bogus value -- do we want this feature?
{
RunInstallOnThread((void *)installInfo);
}