[libav-devel] [PATCH] avcodec_encode_{audio, video}: only reallocate output packet when it has non-zero size.

[Anton Khirnov]

Otherwise realloc would free it, which would result in double free
later.
---
 libavcodec/utils.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 7d50bd5..aa0f5b6 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -960,7 +960,7 @@ int attribute_align_arg 
avcodec_encode_audio2(AVCodecContext *avctx,
             avctx->frame_size = fs_tmp;
     }
     if (!ret) {
-        if (!user_packet && avpkt->data) {
+        if (!user_packet && avpkt->size) {
             uint8_t *new_data = av_realloc(avpkt->data, avpkt->size);
             if (new_data)
                 avpkt->data = new_data;
@@ -1123,7 +1123,7 @@ int attribute_align_arg 
avcodec_encode_video2(AVCodecContext *avctx,
         else if (!(avctx->codec->capabilities & CODEC_CAP_DELAY))
             avpkt->pts = avpkt->dts = frame->pts;
 
-        if (!user_packet && avpkt->data) {
+        if (!user_packet && avpkt->size) {
             uint8_t *new_data = av_realloc(avpkt->data, avpkt->size);
             if (new_data)
                 avpkt->data = new_data;
-- 
1.7.9.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel