From 05a4bacbf7ece618553d339afe1d0b57bc87aea8 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Thu, 9 Jun 2016 18:35:03 -0400 Subject: [PATCH] avpacket: Error out when creating 0-sized side data This mimics the behaviour of other av_*_new_side_data(). This is not caught by the malloc check, since padding is always added to the allocated size. Signed-off-by: Vittorio Giovara --- libavcodec/avpacket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 04d6244163..76fc4eb78f 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -265,7 +265,7 @@ uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type, int ret; uint8_t *data; - if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) + if (!size || (unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) return NULL; data = av_malloc(size + AV_INPUT_BUFFER_PADDING_SIZE); if (!data)