From patchwork Fri May 7 06:42:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 27636 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp271444iof; Thu, 6 May 2021 23:43:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgvFLyduSBZvtEaPTkOefWSidOVfKMZD9m4Dnjw6WSMu/XU9VR2LAG4ur/uQVrnBI6yocE X-Received: by 2002:a17:906:a393:: with SMTP id k19mr8131323ejz.26.1620369791412; Thu, 06 May 2021 23:43:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620369791; cv=none; d=google.com; s=arc-20160816; b=wtQMbajOtKGW0djcN+Rk3Jzxh2eqf5sjNNhD1FvKXq4C9AAAffCHIMvjdlXx1wY3Op aMtABVvkWIT7L6s4gqRFa+zUrnb6RptWh3xibx1zHSX3T7PFqVkcaRDve27ACimUQuu0 MtQhRB3fiEakZVrahfGAc+29WJ9DFfGsZ3L+vOMDCTRkdEJAT8gYxLvJ5cX9h3SjwD0d xznKFTvn94x07KmRuwHZGiDb9WePbvBK3+lsifmoTuAKnLjtJTaEl1lHhrcEkHv4bgZN vrLy+QWbfFO7rtz3AAXJa1GHc1XfgrnzHhw7DpGymrp2afe0R8wDNhLAQA9rVFwT8NM4 doNQ== 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:feedback-id:mime-version:message-id:date :to:from:delivered-to; bh=QWccJUVM47T+S876FseSBgpUp8TxHJ3HNLCsSvaV/Lg=; b=aTzw4RyFak8zpYNYTZh4jQkMb9R4hl0o7cuHnVr2jC9NDV1gjhhs8e5j1USh3IfOIW 4aGjkkx3Z5crG+EhsluujDq0LiwggT/BzaMtYPotXpw70JeRV5SuVY6OxAZdAUg/QFsX pbaKblRpPgovvErfox7rx65Mcm3eYuW1PMBT2SNOmFbEAugNp2J9i6ldxyngHh0HcGOx pDCMhYqX+oIVIQjRqRBqCqibaEMBKR129SClLa9OMRte2jN8SEOeueGt0nP/HV6ZBNL3 54Zn/GrrnI+XbBObagI2qym5JydXdChaqK5qumBLFbNYUxiDDjq2qLtp/cXptzyEmNzo znSQ== ARC-Authentication-Results: i=1; mx.google.com; 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=kuaishou.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v3si4095062edw.61.2021.05.06.23.43.10; Thu, 06 May 2021 23:43:11 -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; 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=kuaishou.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3438468081F; Fri, 7 May 2021 09:43:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpproxy21.qq.com (smtpbg704.qq.com [203.205.195.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B7E0468056D for ; Fri, 7 May 2021 09:42:59 +0300 (EEST) X-QQ-mid: bizesmtp45t1620369771t9psla79 Received: from localhost (unknown [103.107.216.233]) by esmtp6.qq.com (ESMTP) with id ; Fri, 07 May 2021 14:42:49 +0800 (CST) X-QQ-SSF: 01100000004000Z0Z000000A0020000 X-QQ-FEAT: 6fL1zmH9plXSJ0RFhAVL2VDqgQRl+CseZqkDlRGWYP3hYfA20rZ1zMDY2iC7I TtTlUA1AHfklBCrI7sEB0bqPNJC/CRpxKwWIn9yACUZz7HdGmL5TDuRgg53qUawh7eF/+8S vINCQ8qQ+Ikht8bEEGEMKOWBL50/9RNqV9Krhk/CETQO60qmIeW/9YoO+c5tPJKaP6+o7Ky sWtGtVZMKUGqniGnCSetKa9dIxWEmGChuKCkg+tny8SYQB0dqETG5fNmRZanhCPDFpJ2K8R jPTaNyASRnw7EtLNG8M3+xeXsdip+HLE4Zzx+yHwXjuzgvqdctpwkX2SvZir8/Zt2Vbw== X-QQ-GoodBg: 0 X-QQ-CSender: lq@chinaffmpeg.org From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 May 2021 14:42:48 +0800 Message-Id: <20210507064248.17253-1-liuqi05@kuaishou.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign5 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_dnn_classify: add result check for av_frame_get_side_data 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: Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LjYm5F5Exu1P CID: 1482090 there can return null from av_frame_get_side_data, and will use sd->data after av_frame_get_side_data, so should check null return value. Signed-off-by: Steven Liu --- libavfilter/vf_dnn_classify.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavfilter/vf_dnn_classify.c b/libavfilter/vf_dnn_classify.c index 18fcd452d0..7900255cfe 100644 --- a/libavfilter/vf_dnn_classify.c +++ b/libavfilter/vf_dnn_classify.c @@ -77,6 +77,10 @@ static int dnn_classify_post_proc(AVFrame *frame, DNNData *output, uint32_t bbox } sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DETECTION_BBOXES); + if (!sd) { + av_log(filter_ctx, AV_LOG_ERROR, "Cannot get side data in dnn_classify_post_proc\n"); + return -1; + } header = (AVDetectionBBoxHeader *)sd->data; if (bbox_index == 0) {