diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 15:41:01 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-04 15:41:01 +0400 |
| commit | cdafcf838cc7f559b67863183ad1283c97a9ae70 (patch) | |
| tree | 570f24e0159efb7c525c0237b8d6d23ccd38537c /libavcodec/dfa.c | |
| parent | ab2989378fc59128b7e372fadceeb376c9e8cae0 (diff) | |
| parent | 8d617b11cfc87b2c6056fee029ac5bc760af874a (diff) | |
Merge commit '8d617b11cfc87b2c6056fee029ac5bc760af874a'
* commit '8d617b11cfc87b2c6056fee029ac5bc760af874a':
id3v2: pad the APIC packets as required by lavc.
dfa: check for invalid access in decode_wdlt().
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dfa.c')
| -rw-r--r-- | libavcodec/dfa.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index b20cd0e41b..7522a05f8a 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -261,6 +261,8 @@ static int decode_wdlt(GetByteContext *gb, uint8_t *frame, int width, int height segments = bytestream2_get_le16(gb); } line_ptr = frame; + if (frame_end - frame < width) + return AVERROR_INVALIDDATA; frame += width; y++; while (segments--) { |