Commit a2c4b2cc authored by Vitor Sessak's avatar Vitor Sessak

Make TMV decoder check packet sizes before reading from it.

FATE test 295 might need updating.

Originally committed as revision 18862 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 936bb4a9
...@@ -52,6 +52,13 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data, ...@@ -52,6 +52,13 @@ static int tmv_decode_frame(AVCodecContext *avctx, void *data,
return -1; return -1;
} }
if (avpkt->size < 2*char_rows*char_cols) {
av_log(avctx, AV_LOG_ERROR,
"Input buffer too small, truncated sample?\n");
*data_size = 0;
return -1;
}
tmv->pic.pict_type = FF_I_TYPE; tmv->pic.pict_type = FF_I_TYPE;
tmv->pic.key_frame = 1; tmv->pic.key_frame = 1;
dst = tmv->pic.data[0]; dst = tmv->pic.data[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment