summaryrefslogtreecommitdiffstats
path: root/libavcodec/scpr.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2019-04-28 11:06:36 +0200
committerPaul B Mahol <onemda@gmail.com>2019-04-28 11:09:26 +0200
commitea80af659c609dca45eae7ec0fb1b4bfbbc620af (patch)
tree0ea8bb17bd15509736a4b97079e2f3b6e68a7cdf /libavcodec/scpr.c
parent5840a7f8a6d76d0f755dccfe544b58af1ba8b028 (diff)
downloadffmpeg-streaming-ea80af659c609dca45eae7ec0fb1b4bfbbc620af.zip
ffmpeg-streaming-ea80af659c609dca45eae7ec0fb1b4bfbbc620af.tar.gz
avcodec/scpr: avoid using uninitialized value
Fixes #7872.
Diffstat (limited to 'libavcodec/scpr.c')
-rw-r--r--libavcodec/scpr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c
index e5d7d13..ce614ff 100644
--- a/libavcodec/scpr.c
+++ b/libavcodec/scpr.c
@@ -382,8 +382,11 @@ static int decompress_p(AVCodecContext *avctx,
ret = decode_value(s, s->range_model, 256, 1, &min);
ret |= decode_value(s, s->range_model, 256, 1, &temp);
+ if (ret < 0)
+ return ret;
+
min += temp << 8;
- ret |= decode_value(s, s->range_model, 256, 1, &max);
+ ret = decode_value(s, s->range_model, 256, 1, &max);
ret |= decode_value(s, s->range_model, 256, 1, &temp);
if (ret < 0)
return ret;
OpenPOWER on IntegriCloud