diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 13:07:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 13:14:42 +0200 |
| commit | f13f4d2b086519c2b0692ae1ff12d81e8ec494f1 (patch) | |
| tree | 3102afd2f254843b7fbd6a3bfd2cb98ca771cf04 /libavcodec/4xm.c | |
| parent | 18cb3d355f13df255f0d438c06607b637842e8b5 (diff) | |
| parent | 145023f57262d21474e35b4a6069cf95136339d4 (diff) | |
| download | ffmpeg-streaming-f13f4d2b086519c2b0692ae1ff12d81e8ec494f1.zip ffmpeg-streaming-f13f4d2b086519c2b0692ae1ff12d81e8ec494f1.tar.gz | |
Merge commit '145023f57262d21474e35b4a6069cf95136339d4'
* commit '145023f57262d21474e35b4a6069cf95136339d4':
4xm: reject frames not compatible with the declared version
See: c433823750bf096187e70c22822431a7c0bb4202
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 332c10b..3b205f2 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -891,6 +891,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, av_log(f->avctx, AV_LOG_ERROR, "cframe id mismatch %d %d\n", id, avctx->frame_number); + if (f->version <= 1) + return AVERROR_INVALIDDATA; + cfrm->size = cfrm->id = 0; frame_4cc = AV_RL32("pfrm"); } else |
