[FFmpeg-cvslog] jpeg2000: Zero prec->cblk
Michael Niedermayer
git at videolan.org
Thu Jun 6 22:17:04 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 6 22:02:54 2013 +0200| [ffb1051b9b9b876aba109d6ae402ab3a50183554] | committer: Michael Niedermayer
jpeg2000: Zero prec->cblk
Prevent use of uninitialized memory / valgrind failure
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ffb1051b9b9b876aba109d6ae402ab3a50183554
---
libavcodec/jpeg2000.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c
index a2c3e47..947a745 100644
--- a/libavcodec/jpeg2000.c
+++ b/libavcodec/jpeg2000.c
@@ -424,9 +424,9 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
if (!prec->zerobits)
return AVERROR(ENOMEM);
- prec->cblk = av_malloc_array(prec->nb_codeblocks_width *
- (uint64_t)prec->nb_codeblocks_height,
- sizeof(*prec->cblk));
+ prec->cblk = av_mallocz_array(prec->nb_codeblocks_width *
+ (uint64_t)prec->nb_codeblocks_height,
+ sizeof(*prec->cblk));
if (!prec->cblk)
return AVERROR(ENOMEM);
for (cblkno = 0; cblkno < prec->nb_codeblocks_width * prec->nb_codeblocks_height; cblkno++) {
More information about the ffmpeg-cvslog
mailing list