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

dv: check buffer size before reading profile.

Browse Source 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit e97efecec82ca8458a9bbd75a91ebf556abde362)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Ronald S. Bultje 2012-03-07 13:48:41 -08:00 committed by Reinhard Tartler
parent 9cb7f6e54a
commit 74871ac70a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dvdata.c
View File

@ -248,11 +248,13 @@ static const DVprofile dv_profiles[] = {
const DVprofile* avpriv_dv_frame_profile(const DVprofile *sys,
const uint8_t* frame, unsigned buf_size)
{
int i;
int i, dsf, stype;
int dsf = (frame[3] & 0x80) >> 7;
if (buf_size < 80*5 + 48 + 4)
return NULL;
int stype = frame[80*5 + 48 + 3] & 0x1f;
dsf = (frame[3] & 0x80) >> 7;
stype = frame[80*5 + 48 + 3] & 0x1f;
/* 576i50 25Mbps 4:1:1 is a special case */
if (dsf == 1 && stype == 0 && frame[4] & 0x07 /* the APT field */) {