generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2349 from hardening/fix_2348

Browse Source 
Stop created threads if the creation of thread fails
This commit is contained in:
sijchen 2016-01-29 10:02:13 -08:00
commit 9e75838c86
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
codec/encoder/core/src/slice_multi_threading.cpp
View File

@ -961,7 +961,7 @@ int32_t CreateSliceThreads (sWelsEncCtx* pCtx) {
while (iIdx < kiThreadCount) { while (iIdx < kiThreadCount) {
if (WelsThreadCreate (&pCtx->pSliceThreading->pThreadHandles[iIdx], CodingSliceThreadProc, if (WelsThreadCreate (&pCtx->pSliceThreading->pThreadHandles[iIdx], CodingSliceThreadProc,
&pCtx->pSliceThreading->pThreadPEncCtx[iIdx], 0)) { &pCtx->pSliceThreading->pThreadPEncCtx[iIdx], 0)) {
return 1; goto out_fail;
} }
@ -969,6 +969,17 @@ int32_t CreateSliceThreads (sWelsEncCtx* pCtx) {
} }
MT_TRACE_LOG (pCtx, WELS_LOG_INFO, "CreateSliceThreads() exit.."); MT_TRACE_LOG (pCtx, WELS_LOG_INFO, "CreateSliceThreads() exit..");
return 0; return 0;
out_fail:
iIdx--;
while (iIdx >= 0) {
WelsEventSignal(&pCtx->pSliceThreading->pExitEncodeEvent[iIdx]);
WelsEventSignal(&pCtx->pSliceThreading->pThreadMasterEvent[iIdx]);
WelsThreadJoin(pCtx->pSliceThreading->pThreadHandles[iIdx]);
pCtx->pSliceThreading->pThreadHandles[iIdx] = 0;
iIdx--;
}
return 1;
} }
int32_t FiredSliceThreads (sWelsEncCtx* pCtx, SSliceThreadPrivateData* pPriData, WELS_EVENT* pEventsList, int32_t FiredSliceThreads (sWelsEncCtx* pCtx, SSliceThreadPrivateData* pPriData, WELS_EVENT* pEventsList,