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

Fix coverity issues on video render.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/788007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2763 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org 2012-09-12 18:53:54 +00:00
parent 0df21d01f0
commit d58deb3df2
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/video_render/main/source/windows/video_render_direct3d9.cc
View File

@ -1064,7 +1064,7 @@ WebRtc_Word32 VideoRenderDirect3D9::SetBitmap(const void* bitMap,
{ {
WEBRTC_TRACE(kTraceError, kTraceVideo, -1, WEBRTC_TRACE(kTraceError, kTraceVideo, -1,
"Direct3D failed to GetDIBits in SetBitmap"); "Direct3D failed to GetDIBits in SetBitmap");
delete srcPtr; delete[] srcPtr;
return -1; return -1;
} }
DeleteDC(hdcNew); DeleteDC(hdcNew);
@ -1072,7 +1072,7 @@ WebRtc_Word32 VideoRenderDirect3D9::SetBitmap(const void* bitMap,
{ {
WEBRTC_TRACE(kTraceError, kTraceVideo, -1, WEBRTC_TRACE(kTraceError, kTraceVideo, -1,
"Direct3D failed to SetBitmap invalid bit depth"); "Direct3D failed to SetBitmap invalid bit depth");
delete srcPtr; delete[] srcPtr;
return -1; return -1;
} }
@ -1089,21 +1089,21 @@ WebRtc_Word32 VideoRenderDirect3D9::SetBitmap(const void* bitMap,
if (FAILED(ret)) if (FAILED(ret))
{ {
_pTextureLogo = NULL; _pTextureLogo = NULL;
delete srcPtr; delete[] srcPtr;
return -1; return -1;
} }
if (!_pTextureLogo) if (!_pTextureLogo)
{ {
WEBRTC_TRACE(kTraceError, kTraceVideo, -1, WEBRTC_TRACE(kTraceError, kTraceVideo, -1,
"Texture for rendering not initialized."); "Texture for rendering not initialized.");
delete srcPtr; delete[] srcPtr;
return -1; return -1;
} }
D3DLOCKED_RECT lr; D3DLOCKED_RECT lr;
if (FAILED(_pTextureLogo->LockRect(0, &lr, NULL, 0))) if (FAILED(_pTextureLogo->LockRect(0, &lr, NULL, 0)))
{ {
delete srcPtr; delete[] srcPtr;
return -1; return -1;
} }
unsigned char* dstPtr = (UCHAR*) lr.pBits; unsigned char* dstPtr = (UCHAR*) lr.pBits;
@ -1124,7 +1124,7 @@ WebRtc_Word32 VideoRenderDirect3D9::SetBitmap(const void* bitMap,
} }
} }
delete srcPtr; delete[] srcPtr;
if (FAILED(_pTextureLogo->UnlockRect(0))) if (FAILED(_pTextureLogo->UnlockRect(0)))
{ {
return -1; return -1;