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>
This commit is contained in:
parent
e5098589b0
commit
d741638042
@ -465,6 +465,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);
|
||||
@ -868,11 +870,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;
|
||||
|
Loading…
Reference in New Issue
Block a user