From aa6280805e21e1e2c3fb7bb1efb47a27ceeb3fed Mon Sep 17 00:00:00 2001 From: James Almer Date: Wed, 14 Feb 2018 20:56:21 -0300 Subject: [PATCH] avformat/aviobuf: zero initialize the AVIOContext in ffio_init_context() This makes sure no field is ever used uninitialized. Reviewed-by: Carl Eugen Hoyos Reviewed-by: wm4 Signed-off-by: James Almer --- libavformat/aviobuf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 86eb6579f4..d63db3897f 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -87,6 +87,8 @@ int ffio_init_context(AVIOContext *s, int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), int64_t (*seek)(void *opaque, int64_t offset, int whence)) { + memset(s, 0, sizeof(AVIOContext)); + s->buffer = buffer; s->orig_buffer_size = s->buffer_size = buffer_size; @@ -135,7 +137,7 @@ AVIOContext *avio_alloc_context( int (*write_packet)(void *opaque, uint8_t *buf, int buf_size), int64_t (*seek)(void *opaque, int64_t offset, int whence)) { - AVIOContext *s = av_mallocz(sizeof(AVIOContext)); + AVIOContext *s = av_malloc(sizeof(AVIOContext)); if (!s) return NULL; ffio_init_context(s, buffer, buffer_size, write_flag, opaque,