Message ID | tencent_C970112D5F9A0C400A9A719F2AAB094E1608@qq.com |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5007:b0:1a9:af23:56c1 with SMTP id n7csp323930pza; Tue, 30 Apr 2024 00:14:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWwc/U3vkcY+5G85sk2AonEP5MCwJgU7tl1JFoohJCNYcXbL8mqcAB1CXr2D1tfb6ps0x8VP2vn3+/LiXb7uKvYVcKuh3mz6bGRwg== X-Google-Smtp-Source: AGHT+IG+a7tYmc0hkMOL2/GxAXXnv6z3qZ1LUDMvzcVxCQn5F62wb5mHRAuHJvdZYF0U6wjeqrn2 X-Received: by 2002:a17:906:e59:b0:a58:921a:970d with SMTP id q25-20020a1709060e5900b00a58921a970dmr1669883eji.6.1714461258019; Tue, 30 Apr 2024 00:14:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714461258; cv=none; d=google.com; s=arc-20160816; b=wGM4gN8mvtmwWr0SKiC6L16masNcgucEOqjgC6u+fBU7y5HfRZhbOAmIAqKILwowor dEVyrFYCsuwmt6BZiATldwF4ObDcZTBHLAadKgOBZ3CKNwmXVpvxh9wyEgDC0qvcV300 zf3iYfK4IghbCvW4F+eB6kWz/6uZLt95JjhMPVKYdMwgcG9+V3fkUDw3CqfIFxQdUldp 5oH5FN25ov3IKdzZw0u3n94t6G0tLVpmxOLtlqwgbKJ15+mUfpTgf7arTG6ZSBHJqakp Tzw9IK5DH0TERC7dZV4mpVqMsAtTi2rHh4qDe/PE2KY648QJ73ApO2vWnAuHcYk3+9jX FAkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=bNJzmvp/kAe1KqzQ4x8i2wmo6bC16+o+oMyJt7SacXY=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=LViYtAQq7Y2Rypd8NM1/mdB+Hvq/a+pI+1tRqg2AngskUsq5gZiFENRW2HhDx3fD5Q JkzjXZca8Kf+k8nvVz5a/qZ9MTTtBix0bwk3L22uWkDVq0hZk81aL6Q8XQiJiTZQpHJ7 dOKIaDpbDQHluV+rfvXOBsXK4wLmNeBj5w15/gP7tFDeJm4yrWc49IwAUTOOiBimggwV LSW3k2u6eZPHUSpH7LgbLnBgMlDQh43XRDgOjOwi9Z1Bjbv4ryVyzzEw8hQ5T1Xi4cUx LK0sJ99oIc8ylQaxPz2GyqFRiyaqkf61koESPLx5hkDgnjlacXD6urKvDZtW02MztEMU VAPw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=aIvG46kE; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gb24-20020a170907961800b00a55aead4331si11551966ejc.176.2024.04.30.00.14.17; Tue, 30 Apr 2024 00:14:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=aIvG46kE; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A40E68D5BF; Tue, 30 Apr 2024 10:12:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-205.mail.qq.com (out203-205-221-205.mail.qq.com [203.205.221.205]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D91468D5C2 for <ffmpeg-devel@ffmpeg.org>; Tue, 30 Apr 2024 10:12:27 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1714461138; bh=rod3GMoF6TTXU8at+ku8uwfXJdWb2tCpgeC2WwAgris=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aIvG46kE+sFdjhVYomHGeZa5jpVO+ivdKxL3IYBb5xaRhd1ikzZqqKBEG/ogc8Lvs i+ELst5hI0pklVXxNh8/dZB3yd25G/MQWzFepW5jDSf735xqegVxnJdekBEJSNkRkT 7KB/7Dpd2lyiZh00jxn4kBz/HQpz/rlBV468PSMc= Received: from localhost.localdomain ([113.108.77.51]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 3091B0E9; Tue, 30 Apr 2024 15:12:09 +0800 X-QQ-mid: xmsmtpt1714461137t9fwmv0wv Message-ID: <tencent_C970112D5F9A0C400A9A719F2AAB094E1608@qq.com> X-QQ-XMAILINFO: MQ+wLuVvI2LQq5yd8q1VaGiHqTk+NSulqnKpdEgBpH+3B6MKfdoqXWXimrZgjl Tg9jSqJO1VnJSAukRb6WXOxul0QhkPgASMKOuLlAKM55bc4OtkXlsfxZsgP1Hmlt8/Xxu7iMN28X Hdu6DdiSI5EEs1u97ftxvQDq80SR28J2jV1HUtJR1sRClmcXMQqsazPQg4JXeD1CyRL/iwWXDIow 1dMpRihfCc50pn3LBKWJb+VTfQCA+JlUW3q0asM3bLKFsOCPVFACq/VDQp5kktf/Q5d4EXUJgefd eCOI9ZZMz98zJ/RjpRkDbGwbYhVYu5D+AfwZSPc02K0T+6IPO6gRRch7AwB7CTOnu2ZYEOS11EsS 5i/ors2hExS3zJaoinZh3zkW3wrX3UiANwb1jcBZEPSbyzsFJRhlZnG2CtJrM2DEADPB+6Q7sqs5 Vyzl07/czCRtOoNMZlDbNDzkwpaQUyLqGun9J7uNyGw/o7f6jUkdYUHLSCojAkV8QKfqwLB0AQf1 1G1Ey75Z3Iboyqw4xF90BbF07wgvn0gJ5pOhXKyDjmyTYIbDV3PBqRPSXg+axolupCICVlQK4eUp qEN4s8xmrFMNwUOuX4X53vAyaIRkd3aMhHGq3r3+kqSBDn3IEW8Te4B2+Xzleh7A567kgxCOImsZ UgJdkjlb0EM8V0HRvpYz10c5ZeSRziGotZJJA96VXxz01gWqB+b4zlJHsd0eUpJbEXTibZy+vV62 BWBk/yQveBKrMBNMn86E28zxrK/D2zYZt0zItO0CaeiNzfNZypbuKKa3Zzn3F2a8DOWgfdQJGcjD stD+zSmyySCN9EJJRZijCWzGP9KwfwDEkorEpGWMODk3owgRFjDxz+jiu/oLYQ2hX2tpTgJ2WsKP UCUJ2OzNg4yVqv4RoTlrd/3G5xa+Q5r2YGQH3945tio2TXBwA6uc4NYDZV98IvtGebSFw0YmlSQD MHCyv6Ptx3rlXjw6PqEtVsvvUfEvlkXmyIqIfO/IO0WAZLQe6XgGkkEXMh6MCRHO8fVW5BeeF99N KkJs4rl0VCp2cICW2eQr0tD+3Srek= X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili <quinkblack@foxmail.com> To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Apr 2024 15:12:08 +0800 X-OQ-MSGID: <20240430071208.126817-11-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240430071208.126817-1-quinkblack@foxmail.com> References: <20240430071208.126817-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 10/10] 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 <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Zhao Zhili <zhilizhao@tencent.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: +7DuznpDqYeN |
Series |
[FFmpeg-devel,v3,01/10] avfilter/dnn: Refactor DNN parameter configuration system
|
expand
|
diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index 926966368a..1830bae181 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); }
From: Zhao Zhili <zhilizhao@tencent.com> --- libavfilter/vf_dnn_detect.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)