[FFmpeg-cvslog] dca: Read params->pancABIT0[param_index] only if part0 is set

Niels Möller git at videolan.org
Tue Mar 17 20:40:13 CET 2015


ffmpeg | branch: master | Niels Möller <nisse at lysator.liu.se> | Mon Mar 16 22:31:41 2015 +0100| [c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9] | committer: Luca Barbato

dca: Read params->pancABIT0[param_index] only if part0 is set

Prevent a spurious read from uninitialized memory.

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

 libavcodec/dca_xll.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c
index 0c32d6e..5a558b8 100644
--- a/libavcodec/dca_xll.c
+++ b/libavcodec/dca_xll.c
@@ -514,8 +514,8 @@ int ff_dca_xll_decode_audio(DCAContext *s, AVFrame *frame)
             }
             for (i = 0; i < chset->channels; i++) {
                 int param_index = params->seg_type ? 0 : i;
-                int bits        = params->pancABIT0[param_index];
                 int part0       = params->nSamplPart0[param_index];
+                int bits        = part0 ? params->pancABIT0[param_index] : 0;
                 int *sample_buf = s->xll_sample_buf +
                                   (in_channel + i) * s->xll_smpl_in_seg;
 



More information about the ffmpeg-cvslog mailing list