RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 00:07:33 +00:00
Code Issues Releases Wiki Activity

Fix two memory accesses to unallocated memory (detected by electric fence)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1806 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
jkeil 2001-08-31 19:19:15 +00:00
parent 8f858e4ddb
commit a0d8dad7c1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
loader/dshow/DS_VideoDecoder.c
View File

@ -63,7 +63,8 @@ DS_VideoDecoder::DS_VideoDecoder(const CodecInfo& info, const BITMAPINFOHEADER&
m_sOurType.pbFormat = (char*)m_sVhdr;
m_sVhdr2 = (VIDEOINFOHEADER*)(new char[sizeof(VIDEOINFOHEADER)+12]);
memcpy(m_sVhdr2, m_sVhdr, sizeof(VIDEOINFOHEADER)+12);
memcpy(m_sVhdr2, m_sVhdr, sizeof(VIDEOINFOHEADER));
memset((char*)m_sVhdr2 + sizeof(VIDEOINFOHEADER), 0, 12);
m_sVhdr2->bmiHeader.biCompression = 0;
m_sVhdr2->bmiHeader.biBitCount = 24;
@ -79,7 +80,8 @@ DS_VideoDecoder::DS_VideoDecoder(const CodecInfo& info, const BITMAPINFOHEADER&
m_sDestType.pUnk = 0;
m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER);
m_sDestType.pbFormat = (char*)m_sVhdr2;
memcpy(&m_obh, m_bh, sizeof(m_obh));
memset(&m_obh, 0, sizeof(m_obh));
memcpy(&m_obh, m_bh, sizeof(m_obh) < m_bh->biSize ? sizeof(m_obh) : m_bh->biSize);
m_obh.SetBits(24);
HRESULT result;