Skip to content
Snippets Groups Projects
Commit 145d0c4b authored by Karsten Suehring's avatar Karsten Suehring
Browse files

Merge branch 'fix-xFlushOutput' into 'master'

Fix segmentation fault in xFlushPicture after 620d0a0f

See merge request jvet/VVCSoftware_VTM!1134
parents 81cd174a 59840dae
No related branches found
No related tags found
1 merge request!1134Fix segmentation fault in xFlushPicture after 620d0a0f
Pipeline #3402 passed
...@@ -880,6 +880,9 @@ void DecApp::xFlushOutput( PicList* pcListPic ) ...@@ -880,6 +880,9 @@ void DecApp::xFlushOutput( PicList* pcListPic )
pcPic->destroy(); pcPic->destroy();
delete pcPic; delete pcPic;
pcPic = NULL; pcPic = NULL;
#if JVET_N0278_FIXES
*iterPic = nullptr;
#endif
} }
iterPic++; iterPic++;
} }
...@@ -888,13 +891,7 @@ void DecApp::xFlushOutput( PicList* pcListPic ) ...@@ -888,13 +891,7 @@ void DecApp::xFlushOutput( PicList* pcListPic )
#if JVET_N0278_FIXES #if JVET_N0278_FIXES
if( layerId != NOT_VALID ) if( layerId != NOT_VALID )
{ {
for( iterPic = pcListPic->begin(); iterPic != pcListPic->end(); iterPic++ ) pcListPic->remove_if([](Picture* p) { return p == nullptr; });
{
if( *iterPic == nullptr )
{
pcListPic->erase( iterPic );
}
}
} }
else else
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment