RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed wrong allocation of the BITMAPINFOHEADER structure which would crash mplayer in some cases. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11330 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
mosu 2003-10-30 14:50:04 +00:00
parent f879cb74af
commit c5c7fbf3ff
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmpdemux/demux_mkv.cpp
View File

@ -2020,12 +2020,12 @@ extern "C" int demux_mkv_open(demuxer_t *demuxer) {
BITMAPINFOHEADER *bih;
idesc = NULL;
bih = (BITMAPINFOHEADER *)safemalloc(track->private_size);
memset(bih, 0, sizeof(BITMAPINFOHEADER));
if (track->ms_compat) { // MS compatibility mode
BITMAPINFOHEADER *src;
src = (BITMAPINFOHEADER *)track->private_data;
bih = (BITMAPINFOHEADER *)safemalloc(track->private_size);
memset(bih, 0, track->private_size);
bih->biSize = get_uint32(&src->biSize);
bih->biWidth = get_uint32(&src->biWidth);
bih->biHeight = get_uint32(&src->biHeight);
@ -2042,6 +2042,8 @@ extern "C" int demux_mkv_open(demuxer_t *demuxer) {
track->private_size - sizeof(BITMAPINFOHEADER));
} else {
bih = (BITMAPINFOHEADER *)safemalloc(sizeof(BITMAPINFOHEADER));
memset(bih, 0, sizeof(BITMAPINFOHEADER));
bih->biSize = sizeof(BITMAPINFOHEADER);
bih->biWidth = track->v_width;
bih->biHeight = track->v_height;