summaryrefslogtreecommitdiffstats
path: root/libavcodec/dvdata.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-04 04:21:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-04 04:22:55 +0200
commit51b0694bc051cda2bfed048a35e694d1047c6ef0 (patch)
treebdad2c5fd83fa49177d61463c65bbf351c4fc3c5 /libavcodec/dvdata.c
parentdd968a2edf0c07562ae8fac37702880d04fc21c5 (diff)
downloadffmpeg-streaming-51b0694bc051cda2bfed048a35e694d1047c6ef0.zip
ffmpeg-streaming-51b0694bc051cda2bfed048a35e694d1047c6ef0.tar.gz
ff_dv_frame_profile2: Check input buffer size.
Based on code by DivX, Inc. / drffmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvdata.c')
-rw-r--r--libavcodec/dvdata.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c
index 03e8fcc..66265bc 100644
--- a/libavcodec/dvdata.c
+++ b/libavcodec/dvdata.c
@@ -249,11 +249,13 @@ static const DVprofile dv_profiles[] = {
const DVprofile* ff_dv_frame_profile2(AVCodecContext* codec, 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 < DV_PROFILE_BYTES)
+ 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 */) {
OpenPOWER on IntegriCloud