Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure we AddRef prior to early return in MediaType::Assign.

master
Fedor 2019-06-12 13:44:25 +03:00
parent bec3f9ab93
commit 2af9198eba
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp
View File

@ -82,7 +82,10 @@ MediaType::Assign(const AM_MEDIA_TYPE* aMediaType)
Clear(); Clear();
// Shallow copy. // Shallow copy.
memcpy(this, aMediaType, sizeof(AM_MEDIA_TYPE)); memcpy(static_cast<AM_MEDIA_TYPE*>(this), aMediaType, sizeof(AM_MEDIA_TYPE));
if (pUnk)
pUnk->AddRef();
// Create deep copy of incoming data... // Create deep copy of incoming data...
if (cbFormat) { if (cbFormat) {
@ -92,9 +95,6 @@ MediaType::Assign(const AM_MEDIA_TYPE* aMediaType)
memcpy(pbFormat, aMediaType->pbFormat, cbFormat); memcpy(pbFormat, aMediaType->pbFormat, cbFormat);
} }
if (pUnk)
pUnk->AddRef();
return S_OK; return S_OK;
} }