From: Michael Niedermayer <[email protected]> Avoid a NULL pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]> --- libavcodec/jpeg2000dec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 8319642..f6c1dde 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -207,8 +207,10 @@ static int get_siz(Jpeg2000DecoderContext *s) s->numYtiles = ff_jpeg2000_ceildiv(s->height - s->tile_offset_y, s->tile_height); s->tile = av_mallocz_array(s->numXtiles * s->numYtiles, sizeof(*s->tile)); - if (!s->tile) + if (!s->tile) { + s->numXtiles = s->numYtiles = 0; return AVERROR(ENOMEM); + } for (i = 0; i < s->numXtiles * s->numYtiles; i++) { Jpeg2000Tile *tile = s->tile + i; -- 1.8.2.1 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
