From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8B2174A9F9 for ; Tue, 7 May 2024 16:10:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EB7BA68D7BD; Tue, 7 May 2024 19:08:50 +0300 (EEST) Received: from out203-205-221-155.mail.qq.com (out203-205-221-155.mail.qq.com [203.205.221.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2BFE68D77D for ; Tue, 7 May 2024 19:08:35 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1715098107; bh=y7fq/oHrdhnrOKDgjbk4X7Tc0NkEi3nssvZ6q/MiIY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vIDyvH/jMMKK6xpDaB4yOEhqk0MI3rZKKel2zxfusK4A/JYw3MDxMfPcRvx8MjIoz 9T5AWiOvYeAnn+9j2fHuIqUfS3UwtSsAnF141h0SLMjNgy1BY7scJbopOmXjgLw+ed Ze+3k4NDkvCaVo3ei+dV5h2Beyg/BcWZizg5k1Hc= Received: from localhost.localdomain ([113.118.115.105]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 2148D2A6; Wed, 08 May 2024 00:08:20 +0800 X-QQ-mid: xmsmtpt1715098106tcgf7slm8 Message-ID: X-QQ-XMAILINFO: MI8xiyr9SLuADEL4XnysAmE/WhK4uwL2SMy+UW6yoDEDLKgX9GL+ODi5sSVUx6 +C4FZ5euUUhV0Mmd5ZThTmfdSa6xUk36JZAj4LZkxgjGkDY2Wm21pDBeJR9qA/0Qo+20/8jV29lM 9mnqQ4wTlOZNsFArbrGK62x26B9vLI7sD3ji+Icw6cmFIhQjJkQ0Od5RRask5CSIuSyxAcES7r3C qICBdy5Lkrh6b6ZRN8nohvt31BCupYLLrZxLaaXxpqMfguru16zuVyoCVDZEpBNyXzSx2dpnHy+Y cI+7KpWM6dy9i2NyQIMhXUCYrycw3ptlZ8Pak95Np2oa11fJjx9qvmF/Tt6z+RK7uSTSoV5Kyxn9 xaKOqzf4R4gHxiHxTFMXu02o99fK4xOFnqcs2QoHvswdWviYnX2Pl1fgDVe0seLryb11PKoOAWmy x2yIZ3MK2Z6d8fiMrpQK4DNMzcRBT+OPaVO6G2N3uY6uhW/A81vds4ZHn0Rh4TdvqWIY4ypbGVy4 QzSoIGyEvUdDQ4ow7wMADinlLF6lLvxJNzR+fb5kkqisGP+jGWQU6YOpdoa2h/CuzT5KpZtYz1BU TrN4UfgnZvfUfNZ95brPM1eiNwQ5XUlafdea9alsOWK8W7exk5C4qaRAYScfFPpO4rsP/sXiZSld BuX6VsYEI4h9lFKrqChuU4BvCHcTYghRppyKigJK2jrHC4zsYHIh4lc3GFQAaUx+VXIBVJJRLixV iE/+w5Z20oCiaGPHPjiN43NcAxikGur0MdI/E5vDeBazkKvXmu8SJA9I3L3s0mxDRgw7SrQ+X/Ic UJeccqurX9sVWVRVnPfwXImZSbDk5CbJRJtcysSGEIpIkEtucobwO9qN35n4NoDhlyHexcu3En5F xCvIi3tIgPi+1Wb2+dcWiuYgeppXJJvKU/pGr2oGGZkNghvJs1kwEYskNhH6s+E0mxmZloHGWeGi bO5EpnKp3xsq2K/2DLixzEcChqaXVS X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 May 2024 00:08:18 +0800 X-OQ-MSGID: <20240507160818.71113-12-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240507160818.71113-1-quinkblack@foxmail.com> References: <20240507160818.71113-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 11/11] avfilter/vf_dnn_detect: Fix null pointer dereference X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavfilter/vf_dnn_detect.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index b4eee06fe7..2a277d4169 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -807,11 +807,13 @@ static av_cold void dnn_detect_uninit(AVFilterContext *context) DnnDetectContext *ctx = context->priv; AVDetectionBBox *bbox; ff_dnn_uninit(&ctx->dnnctx); - while(av_fifo_can_read(ctx->bboxes_fifo)) { - av_fifo_read(ctx->bboxes_fifo, &bbox, 1); - av_freep(&bbox); + if (ctx->bboxes_fifo) { + while (av_fifo_can_read(ctx->bboxes_fifo)) { + av_fifo_read(ctx->bboxes_fifo, &bbox, 1); + av_freep(&bbox); + } + av_fifo_freep2(&ctx->bboxes_fifo); } - av_fifo_freep2(&ctx->bboxes_fifo); av_freep(&ctx->anchors); free_detect_labels(ctx); } -- 2.34.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".