Fixes: CID1441459 Improper use of negative value
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
---
libavcodec/scpr3.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/libavcodec/scpr3.c b/libavcodec/scpr3.c
index 79106ddcff8..45706123db0 100644
--- a/libavcodec/scpr3.c
+++ b/libavcodec/scpr3.c
@@ -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;
--
2.43.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
