[FFmpeg-cvslog] avcodec/atrac3: Check init_get_bits8() for failure

Michael Niedermayer git at videolan.org
Thu Mar 30 23:13:58 EEST 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Mar 30 19:00:00 2017 +0200| [e976e68fc5513fea05b45556cbe959e6675dbe7d] | committer: Michael Niedermayer

avcodec/atrac3: Check init_get_bits8() for failure

This is more for correctness than actually fixing a missing error path

Fixes CID1399967

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e976e68fc5513fea05b45556cbe959e6675dbe7d
---

 libavcodec/atrac3.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 88ee9ba..6cdcdf1 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -693,8 +693,10 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *databuf,
 
 
             /* set the bitstream reader at the start of the second Sound Unit */
-            init_get_bits8(&q->gb,
+            ret = init_get_bits8(&q->gb,
                            ptr1, q->decoded_bytes_buffer + js_block_align - ptr1);
+            if (ret < 0)
+                return ret;
 
             /* Fill the Weighting coeffs delay buffer */
             memmove(q->weighting_delay[js_pair], &q->weighting_delay[js_pair][2],



More information about the ffmpeg-cvslog mailing list