[FFmpeg-cvslog] avcodec/loco: check get_ur_golomb_jpegls() for failure
Michael Niedermayer
git at videolan.org
Wed Jul 24 17:49:57 EEST 2024
ffmpeg | branch: release/4.3 | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 5 02:21:51 2024 +0200| [271b7ce6f59f040c99b4a02b67c09069b71cba84] | committer: Michael Niedermayer
avcodec/loco: check get_ur_golomb_jpegls() for failure
Fixes: CID1604400 Overflowed constant
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit b9899866418cb3bd930846271470e3096917f5f6)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=271b7ce6f59f040c99b4a02b67c09069b71cba84
---
libavcodec/loco.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavcodec/loco.c b/libavcodec/loco.c
index 25dd1575ba..6c389ba81c 100644
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@@ -91,10 +91,15 @@ static inline int loco_get_rice(RICEContext *r)
if (get_bits_left(&r->gb) < 1)
return INT_MIN;
v = get_ur_golomb_jpegls(&r->gb, loco_get_rice_param(r), INT_MAX, 0);
+ if (v == -1)
+ return INT_MIN;
loco_update_rice_param(r, (v + 1) >> 1);
if (!v) {
if (r->save >= 0) {
- r->run = get_ur_golomb_jpegls(&r->gb, 2, INT_MAX, 0);
+ int run = get_ur_golomb_jpegls(&r->gb, 2, INT_MAX, 0);
+ if (run == -1)
+ return INT_MIN;
+ r->run = run;
if (r->run > 1)
r->save += r->run + 1;
else
More information about the ffmpeg-cvslog
mailing list