virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/scpr: error out if run length is <= 0

Browse Source
This commit is contained in:
Paul B Mahol 2018-08-29 23:11:45 +02:00
parent b205635fbc
commit d71dfc087b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/scpr.c
View File

@ -334,6 +334,8 @@ static int decompress_i(AVCodecContext *avctx, uint32_t *dst, int linesize)
ret = decode_value(s, s->run_model[0], 256, 400, &run); ret = decode_value(s, s->run_model[0], 256, 400, &run);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (run <= 0)
return AVERROR_INVALIDDATA;
clr = (b << 16) + (g << 8) + r; clr = (b << 16) + (g << 8) + r;
k += run; k += run;
@ -382,6 +384,8 @@ static int decompress_i(AVCodecContext *avctx, uint32_t *dst, int linesize)
ret = decode_value(s, s->run_model[ptype], 256, 400, &run); ret = decode_value(s, s->run_model[ptype], 256, 400, &run);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (run <= 0)
return AVERROR_INVALIDDATA;
switch (ptype) { switch (ptype) {
case 0: case 0:
@ -615,6 +619,8 @@ static int decompress_p(AVCodecContext *avctx,
ret = decode_value(s, s->run_model[ptype], 256, 400, &run); ret = decode_value(s, s->run_model[ptype], 256, 400, &run);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (run <= 0)
return AVERROR_INVALIDDATA;
switch (ptype) { switch (ptype) {
case 0: case 0: