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

Handle osl_createThread failure

Browse Source 
Change-Id: I58144461d3941359f8ea6c2bd547486b2c8ae81a
This commit is contained in:
Stephan Bergmann
2014-01-13 14:25:20 +01:00
parent a675873cb2
commit 3c8d74eb3f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sal/osl/unx/process.cxx
View File

@@ -685,7 +685,10 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
hThread = osl_createThread(ChildStatusProc, &Data); hThread = osl_createThread(ChildStatusProc, &Data);
osl_waitCondition(Data.m_started, NULL); if (hThread != 0)
{
osl_waitCondition(Data.m_started, NULL);
}
osl_destroyCondition(Data.m_started); osl_destroyCondition(Data.m_started);
for (i = 0; Data.m_pszArgs[i] != NULL; i++) for (i = 0; Data.m_pszArgs[i] != NULL; i++)
@@ -703,12 +706,14 @@ oslProcessError SAL_CALL osl_psz_executeProcess(sal_Char *pszImageName,
if (Data.m_pProcImpl->m_pid != 0) if (Data.m_pProcImpl->m_pid != 0)
{ {
assert(hThread != 0);
*pProcess = Data.m_pProcImpl; *pProcess = Data.m_pProcImpl;
if (Options & osl_Process_WAIT) if (Options & osl_Process_WAIT)
osl_joinProcess(*pProcess); osl_joinProcess(*pProcess);
return osl_Process_E_None; return osl_Process_E_None;
} }
osl_destroyCondition(Data.m_pProcImpl->m_terminated); osl_destroyCondition(Data.m_pProcImpl->m_terminated);