From patchwork Wed Mar 1 03:59:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5b6Q56aP6ZqG?= <839789740@qq.com> X-Patchwork-Id: 40559 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2750405pzb; Tue, 28 Feb 2023 19:59:43 -0800 (PST) X-Google-Smtp-Source: AK7set94jfCddRtFmy1ZDX9O0lFxrTXVfKvmP1E1ng6kTUAcFhualub9GLb1AMkN3Ozwr1MNTsQ2 X-Received: by 2002:aa7:cc0e:0:b0:4ab:4d3c:7e99 with SMTP id q14-20020aa7cc0e000000b004ab4d3c7e99mr4951698edt.2.1677643183624; Tue, 28 Feb 2023 19:59:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677643183; cv=none; d=google.com; s=arc-20160816; b=G9pYwzW6R6KrItTcX75/gyDi21MsCJrwNXqciQUOr/xcX8+Rq/8KVPQ3q+k8FrgQLc 4ecoyWEV7oUy3WTVyPsSNeYthuZPbwdS663pAQK0CAygkR3HotsnsRy71BH+wL4BsUcn 8yvcltrK4nET30fOCq6pQTuE6NoKIiD3RvCi7GUqO2Cy37EO/tsKVKjSr8b4tPbr3H1d hOhX2SHCT8YfqYgQUo+5124pavtCdU/ccyzyN/rktCIoTnWGuQG7lQo8mPcG7yKmWFRB sLchPs4v4UGtYXEfOBwpkxQv5d4oaTcJpv1HahZwgdqSkmlvMQ+tu/5tD8blJ63IiS7x s+4g== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=kNlW7QWfCvJrt0rqTh+DbF4txPFiKjTBQvzNswVrynA=; b=L67aB/xvUsR55n3+WD7ytLo/8guOha7+JqTX9mdM4RkIwjwKF8syJLpxxpSZr6pjIL nVBcoabhtEFu7Jj9nJqigXYckCDejxu7bI5vdWy72/yjR7jdF3X3pMbXAZna8c9qJApa T0/JaKUrTAl1kiRxmEQFu6qjIYQmdn3WcGrWtSvwINkcBpYeazQDgT+J+iTcQUMqfArL /MFACbwk+VGYVDmh8SpoRa9pn/hGNvvSkvvxc+Ml2aZdjkmsqnY7Ksjv5zAZlJdHu68M 7XU9hy06IY4Mo0x3zYk0FEiRYHqeHz7iUEvnmpkQQc/vnANFSQ5vHMBmLvSM9oVDpbxV Hicw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@qq.com header.s=s201512 header.b=Ls8SgR9b; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=qq.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x23-20020aa7dad7000000b004ab15dd69fdsi3474236eds.494.2023.02.28.19.59.42; Tue, 28 Feb 2023 19:59:43 -0800 (PST) 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=@qq.com header.s=s201512 header.b=Ls8SgR9b; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=qq.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C28C68A870; Wed, 1 Mar 2023 05:59:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90C4168A11B for ; Wed, 1 Mar 2023 05:59:32 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1677643164; bh=pCTKIyuP69MsMpA2SbXm6gohGAeH693GKa19zqNYmXw=; h=From:To:Cc:Subject:Date; b=Ls8SgR9bRjIboLoy5NKghRltivgDj46FrkLxZuMpIbVQtsTukHSQ9mE8TNP60ocOt BkHXE2lJCDfZuHSg3auRKf9EYrxMVvVGMMm23MZy1KOXtrqIM8gr2978UF/bdglUzG XLSSe1I6KGyFTxjOPO+PvkPMN1CiK/xQjZijJdbo= Received: from localhost.localdomain ([113.66.216.130]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id ED6874B3; Wed, 01 Mar 2023 11:59:22 +0800 X-QQ-mid: xmsmtpt1677643162t9wpfixzy Message-ID: X-QQ-XMAILINFO: MzYTHVlhOHw4d0UQ90Sbm1JOPCX31Fv9mHsymGApbRJzFTEHqWpLuf2UVGPGjE ARRL+q/AZHoCrWDMZiZ7FiPEEo73AxlJ6tgCNdmwX3lJciCcX1p/OC3q+/nzGJZWrjlQxpVsmsPI 8A9bKSX857ibGDJun+H7lQ2HUq1quWUHmFDcuUxyLdPs31pAUi4WDkFb5dq2tys6rgkYBefo94uT D2zl1vsg5lfVDV2t+ajf9YuF6suKDBoXlXNilnx75WDNzPPaFE0QrhPA8hZqDY3hF+yZUXjGBd/v VqJx2OX16QNs+24ipoz/JZ1pYQD+7ujLp1zNUqmFUNbPZQONYAWXn6xHV4x0RWce0WSKq2e6ImYQ snBH6yqVxEFpGRJQxDzrE8nlnBJEdYTJawLGqUDAspqJlqJLEiYq4GTa9V43LZON8BU9PTF4ZPE8 oHiEWsbMf752F8s0vx6v6t+FinolrBsKy2hChVI4Kzs60/oPC+oPxV0Ix9dXoe4VTcTNf94bzo0v bG9nPVlgBz5p4K8GlmABhvy/cb6w/pxBsK16j15rqMAm5VcK4gf+BcOdXTiiLUHCs8rz/wm6val0 IPCHTvksWCglKz5Pk85N8DnUIof/eXDRHe/PUIA0fwTx/3yWV+HQcH65QAqjlKrGplrazqOZu22t imcg/4NrRJlOn2iXMHWk6SkIGor2RbZ9g2iQo7U4rGZCkxP0sasGPVTHNcCj64gsuiRcypgbNj8R lOPHmMJ5wtJDycZzz1my2rR7+o0oybSpXM/I1dEAQYLmmMgO3JWFfZJkWGD4F4LZj5seZzNpje3c 95GbxnA9/hKPJYqfzA6rWK6CgBsIeY68mD1o/yvSs5xsZQGLtFF3X/Xhn4VPkYgLKJyLY1M8t4l/ LqWW6pMFyyQ0ssfN1OhC+PYV/jmIt4RbTUBGcPvPstJzCB9olrjBWiOU0SvRlA40gkQCUaRlhour gAHg0yBbsKa3AADTwyh8/mmKX09Fpx From: xufuji456 <839789740@qq.com> To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Mar 2023 11:59:19 +0800 X-OQ-MSGID: <20230301035919.2069-1-839789740@qq.com> X-Mailer: git-send-email 2.32.0 (Apple Git-132) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libswresample/audioconvert: check whether input frame data is null pointer 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: xufuji456 <839789740@qq.com> Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 6tS9g0m9Htro --- libswresample/audioconvert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswresample/audioconvert.c b/libswresample/audioconvert.c index 1d75ba1495..b297514b1a 100644 --- a/libswresample/audioconvert.c +++ b/libswresample/audioconvert.c @@ -242,7 +242,7 @@ int swri_audio_convert(AudioConvert *ctx, AudioData *out, AudioData *in, int len const int is= ich < 0 ? 0 : (in->planar ? 1 : in->ch_count) * in->bps; const uint8_t *pi= ich < 0 ? ctx->silence : in->ch[ich]; uint8_t *end, *po = out->ch[ch]; - if(!po) + if(!po || !pi) continue; end = po + os * len; ctx->conv_f(po+off*os, pi+off*is, is, os, end);