diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-04 04:21:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-04 00:42:46 +0100 |
| commit | 4f45967cf5138fb2c7567c5b3d0fb697998b2aeb (patch) | |
| tree | 5ea8bcae97db02cb25fd26c66d68c8222272c87f | |
| parent | 78eab18740b457bc482845d5f4ec8fe484e0afb3 (diff) | |
| download | ffmpeg-4f45967cf5138fb2c7567c5b3d0fb697998b2aeb.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>
(cherry picked from commit 51b0694bc051cda2bfed048a35e694d1047c6ef0)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dvdata.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/dvdata.c b/libavcodec/dvdata.c index 05993d874f..db6ed2b871 100644 --- a/libavcodec/dvdata.c +++ b/libavcodec/dvdata.c @@ -248,11 +248,13 @@ static const DVprofile dv_profiles[] = { const DVprofile* ff_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 < 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 */) { |