aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-18 02:01:50 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-18 02:02:00 +0100
commit6f14434218878c2f31c03e1a43b3506f398d6d7c (patch)
tree4de890e3dae923e2ad68e39b2ed4b6a16447d10f
parent49f477071dcda8bc956b30020808d05c005577e0 (diff)
parent484e015dc8b9983297e9269b406c65084daf4528 (diff)
downloadffmpeg-6f14434218878c2f31c03e1a43b3506f398d6d7c.tar.gz
Merge commit '484e015dc8b9983297e9269b406c65084daf4528' into release/2.4
* commit '484e015dc8b9983297e9269b406c65084daf4528': cook: Make sure there is enough extradata See: c9e455432988acd414990ba92f782b8e3c4b6aea Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/cook.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 0cc01d05c9..cfbce2a58a 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1058,7 +1058,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
q->avctx = avctx;
/* Take care of the codec specific extradata. */
- if (extradata_size <= 0) {
+ if (extradata_size < 8) {
av_log(avctx, AV_LOG_ERROR, "Necessary extradata missing!\n");
return AVERROR_INVALIDDATA;
}