RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/scpr3: Check add_dec() for failure 

Fixes: CID1441459 Improper use of negative value

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit d741638042)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2024-05-16 21:16:00 +02:00
parent 99c8b0ac22
commit 86a2543744
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/scpr3.c
View File

@ -466,6 +466,8 @@ static int decode_adaptive6(PixelModel3 *m, uint32_t code, uint32_t *value,
return 0;
grow_dec(m);
c = add_dec(m, q, g, f);
if (c < 0)
return AVERROR_INVALIDDATA;
}
incr_cntdec(m, c);
@ -885,11 +887,11 @@ static int decode_unit3(SCPRContext *s, PixelModel3 *m, uint32_t code, uint32_t
sync_code3(gb, rc);
break;
case 6:
if (!decode_adaptive6(m, code, value, &a, &b)) {
ret = decode_adaptive6(m, code, value, &a, &b);
if (!ret)
ret = update_model6_to_7(m);
if (ret < 0)
return AVERROR_INVALIDDATA;
}
if (ret < 0)
return ret;
decode3(gb, rc, a, b);
sync_code3(gb, rc);
break;