mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4189 from nfedera/fix-h264-init

Browse Source 
codec/h264: fix potential segfault and mf_init
This commit is contained in:
Norbert Federa 2017-10-17 21:33:16 +02:00 committed by GitHub
commit 16d9104590
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfreerdp/codec/h264.c
View File

@ -468,7 +468,7 @@ BOOL h264_context_init(H264_CONTEXT* h264)
for (i = 0; i < MAX_SUBSYSTEMS; i++)
{
H264_CONTEXT_SUBSYSTEM* subsystem = subSystems[i];
if (!subsystem->Init)
if (!subsystem || !subsystem->Init)
break;
if (subsystem->Init(h264))

8
libfreerdp/codec/h264_mf.c
View File

@ -517,10 +517,12 @@ static BOOL mf_init(H264_CONTEXT* h264)
"MFCreateMediaType");
sys->MFCreateDXGIDeviceManager = (pfnMFCreateDXGIDeviceManager) GetProcAddress(
sys->mfplat, "MFCreateDXGIDeviceManager");
/**
* Note: MFCreateDXGIDeviceManager is supported starting from Windows 8.
* Don't fail below if GetProcAddress returned NULL.
*/
if (!sys->MFStartup || !sys->MFShutdown || !sys->MFCreateSample
|| !sys->MFCreateMemoryBuffer ||
!sys->MFCreateMediaType || !sys->MFCreateDXGIDeviceManager)
|| !sys->MFCreateMemoryBuffer || !sys->MFCreateMediaType)
goto error;
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);