diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-13 23:25:38 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-13 23:26:38 +0400 |
| commit | 0c23ee131257403332d4d06113473241f14d1010 (patch) | |
| tree | db58ace61b11fccc708cc43b70e2ee1d6a26470c /libavcodec/mjpegdec.c | |
| parent | 7d7a701362867439e9ce04fb0227b53de62704c4 (diff) | |
avcodec/mjpegdec: use mallocz for progressive blocks
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f849c599487_6828_mjpeg.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 187f32595a..e86e0930ec 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -510,7 +510,7 @@ unk_pixfmt: int size = bw * bh * s->h_count[i] * s->v_count[i]; av_freep(&s->blocks[i]); av_freep(&s->last_nnz[i]); - s->blocks[i] = av_malloc(size * sizeof(**s->blocks)); + s->blocks[i] = av_mallocz(size * sizeof(**s->blocks)); s->last_nnz[i] = av_mallocz(size * sizeof(**s->last_nnz)); if (!s->blocks[i] || !s->last_nnz[i]) return AVERROR(ENOMEM); |