aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-13 20:26:11 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-13 21:48:28 +0200
commite54f4510aa45d8074544dc8b565f6e32c66ef404 (patch)
tree6dae397503adfd29797a19bf46aa13d03c27fcf2
parentede7602cba81fd466b62aa812c2a0d0cd9c7c19d (diff)
downloadffmpeg-e54f4510aa45d8074544dc8b565f6e32c66ef404.tar.gz
avcodec/jpeg2000: zero i/f_data
Fixes uninitialized use of variables Fixes part of Ticket2921 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/jpeg2000.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c
index 36e6ff1a5a..f3658c2c84 100644
--- a/libavcodec/jpeg2000.c
+++ b/libavcodec/jpeg2000.c
@@ -215,12 +215,12 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
if (codsty->transform == FF_DWT97) {
comp->i_data = NULL;
- comp->f_data = av_malloc_array(csize, sizeof(*comp->f_data));
+ comp->f_data = av_mallocz_array(csize, sizeof(*comp->f_data));
if (!comp->f_data)
return AVERROR(ENOMEM);
} else {
comp->f_data = NULL;
- comp->i_data = av_malloc_array(csize, sizeof(*comp->i_data));
+ comp->i_data = av_mallocz_array(csize, sizeof(*comp->i_data));
if (!comp->i_data)
return AVERROR(ENOMEM);
}