[FFmpeg-devel] [PATCH] avcodec/amfenc: Add check and av_frame_free() for av_frame_alloc()

[Jiasheng Jiang <jiashengjiangcool@gmail.com>]

Add check and av_frame_free() for the return value of av_frame_alloc() to avoid potential NULL pointer dereference and memory leak.

Fixes: 88a8ba5c99 ("avcodec/amfenc: redesign to use hwcontext_amf.")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
 libavcodec/amfenc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
index b16b642e4c..64ec232509 100644
--- a/libavcodec/amfenc.c
+++ b/libavcodec/amfenc.c
@@ -683,6 +683,10 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt)
     int64_t     pts = 0;
     int max_b_frames = ctx->max_b_frames < 0 ? 0 : ctx->max_b_frames;
 
+    if (!frame) {
+        return AVERROR(ENOMEM);
+    }
+
     if (!ctx->encoder){
         av_frame_free(&frame);
         return AVERROR(EINVAL);
@@ -690,6 +694,7 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt)
     // check if some outputs are available
     av_fifo_read(ctx->output_list, &buffer, 1);
     if (buffer != NULL) { // return already retrieved output
+        av_frame_free(&frame);
         ret = amf_copy_buffer(avctx, avpkt, buffer);
         buffer->pVtbl->Release(buffer);
         return ret;
-- 
2.25.1

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

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".