diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 16:05:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 16:05:06 +0100 |
| commit | 3138b158dd4bff334263b997664e9c1aeb02127b (patch) | |
| tree | 16fc159fa186ce3866808134d6a3121fcb4f5d5b /libavcodec/yop.c | |
| parent | 769eba75eeaa6ee013d7d0573764531e674b6d9b (diff) | |
| parent | 06cf597c352519d2b70f293518c61b8c312f5d4f (diff) | |
| download | ffmpeg-3138b158dd4bff334263b997664e9c1aeb02127b.tar.gz | |
Merge commit '06cf597c352519d2b70f293518c61b8c312f5d4f'
* commit '06cf597c352519d2b70f293518c61b8c312f5d4f':
yop: check that extradata is large enough.
Conflicts:
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/yop.c')
| -rw-r--r-- | libavcodec/yop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/yop.c b/libavcodec/yop.c index c47f5ec14f..4d9dab8827 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -89,8 +89,8 @@ static av_cold int yop_decode_init(AVCodecContext *avctx) return AVERROR_INVALIDDATA; } - if (!avctx->extradata) { - av_log(avctx, AV_LOG_ERROR, "extradata missing\n"); + if (avctx->extradata_size < 3) { + av_log(avctx, AV_LOG_ERROR, "Missing or incomplete extradata.\n"); return AVERROR_INVALIDDATA; } |