From patchwork Tue Mar 6 22:42:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: C0deAi X-Patchwork-Id: 7835 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp4299263jaj; Tue, 6 Mar 2018 14:42:53 -0800 (PST) X-Google-Smtp-Source: AG47ELuTmVjY5jesQBRCVNiZM3hqOHGMLYoBWSFX+C2skZqIDUgrrTjC7ghmrmFeBQwFdh7duGD9 X-Received: by 10.223.160.157 with SMTP id m29mr17283835wrm.119.1520376173816; Tue, 06 Mar 2018 14:42:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520376173; cv=none; d=google.com; s=arc-20160816; b=kRF766J1ZYj+EW++kaaa7w7hUEaBwF2oTCACiY4B01kB7J71GFLHwYvaRTSJ+trNG7 nknqBf2nTJ7Rark4R/HLhs+HWBzFlYHdKWguRHZisnE3AZt7Y+XD6z1WgS7DeJ/pCzRv b+f9Kbj+bMtZ60G0LopHx9GCfYSOVt7dh66CBonPqMtq9mYymO12YKzzilAmz/cg3sBX NHG2K7ip2dOaOweIGFqTeyz3viX2KEEO7KW2gCzuzl95Z3qVFEmbeJi7hTXBBzeJQ7xz f92CAYvsv55fru8QViZvwx+78Wg+9hfouCtaohhQrWJT+ZyrvaiLcIEgXaEZAaFljDHb DsFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=7BtDNyRxHefLFIUgnxZCIzUd98gQyVX2rl0bHAzRDvE=; b=JxLqNcwVeK0K2kDpZKpqRjY+8rNt82WiCWhHK3SqgMZm228zqK0wSGR/0beg+q3EXu xrhwT0YXf81ZXkdtTvDT+WTWnXhi/cBB7SOnD/MI9cNouiqxgBzPpkkzPKCbdnj6+9GH fbCgDq+VQs+yjsHoOJmj6jaHDK8p2ch4xS+JkrWXp3Nu6+2Bv+22jy2o1BlJGdduROik xHTrHCO37yxB5gYmaHUFu+bgLKPedlF7ci2uVu+ZAjXgu1opVL1PiyPN8zarKyXi3zAo /o56Ue2EjfTwjWXvqQ+pea0+qdTRSXj+Dh6qyd0oJJ/W/0tmYj08HE5BEvIl7TZJICgX NdJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mycode-ai.20150623.gappssmtp.com header.s=20150623 header.b=wHeONh/a; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s9si2294844wrb.43.2018.03.06.14.42.53; Tue, 06 Mar 2018 14:42:53 -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=@mycode-ai.20150623.gappssmtp.com header.s=20150623 header.b=wHeONh/a; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7CD2168A438; Wed, 7 Mar 2018 00:42:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw0-f195.google.com (mail-yw0-f195.google.com [209.85.161.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C597468A27D for ; Wed, 7 Mar 2018 00:42:27 +0200 (EET) Received: by mail-yw0-f195.google.com with SMTP id p70so100611ywg.10 for ; Tue, 06 Mar 2018 14:42:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mycode-ai.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=AQ655i0+tGhetc+6I6jzePNShAZ5ojaJPPPASOHKkQg=; b=wHeONh/aFNb0+sPyPqpgC1qjOBd+0nvf6e0gtnIXBPiS/WGuMWBdC0Y/zkKytIKHwH HynWys3Kv5mqqVVBTX6fiD1i07UnJAOp37K5eE+w7OBwXelDTLkaG7tcu7IB4N/bA0FM vbe0zgfsm6F5sGmcCRGiY7WoA0BXr6jSBiJ94/ms2JdAuLniH29Hv+WF/zbSXYT6mlak T2AfKwVsKcAXgoFRZeVLM+pzyEyFmz+ZXgdgK8/J8lcXTD8CxHdVHHkwpTXFoak5UotU ODloA85KD11LE6Bu02w2tWKQAw5NWwCFP0ovRwkP0hM8/zbbcksBGkezxbwSC51CmUJy +fLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=AQ655i0+tGhetc+6I6jzePNShAZ5ojaJPPPASOHKkQg=; b=YmMi+yBLVxds7sNuVPzsjfdJ2yU1w7+dcSQZ97tYFq4nJ7+X/FCsEFBSCMLWb1VfnR nUH4QN8RcdoO+x3pQS0LRWx2sCSyxMpfLqSUMsnJQRVoCuiLazoswuP7foPg2B1APOqe 1ik9bmDoqwcreWuteox07qvDvIYcOVzkzJNb9lhZ+lYqNLe8wIjg91/QIk2u0o395DxR nPnew/vmw2zDdbPTP8jRdnx6uIeUT9YIEQVySq60wgS/FVAhe4LHzt/MhpyBUylesuRE d8BNmyu7tOO9WfO4O6hRfEnJox9900OLY746O3hvG0VJJV9oK6jcr64R01lygEeBs00w jy9Q== X-Gm-Message-State: APf1xPBfcF6MsX32pm7zp/op9uxQmmqCqE7OzwiydJuFYAtKD7IZZoqP KITj0Ia3RV3HwNUvO2Kzn9uIo/MsQE4= X-Received: by 10.129.101.139 with SMTP id z133mr12643578ywb.49.1520376154545; Tue, 06 Mar 2018 14:42:34 -0800 (PST) Received: from paul-desktop.hsd1.ga.comcast.net (96-87-228-86-static.hfc.comcastbusiness.net. [96.87.228.86]) by smtp.gmail.com with ESMTPSA id i67sm5068244ywc.7.2018.03.06.14.42.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Mar 2018 14:42:34 -0800 (PST) From: C0deAi X-Google-Original-From: C0deAi To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Mar 2018 17:42:19 -0500 Message-Id: <1520376143-5925-2-git-send-email-benjamin.bales@assrc.us> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520376143-5925-1-git-send-email-benjamin.bales@assrc.us> References: <1520376143-5925-1-git-send-email-benjamin.bales@assrc.us> Subject: [FFmpeg-devel] [PATCH 1/5] CodeAi generated fix for CWE 476 Null Pointer Dereference X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Tighten condition to prevent possible Null Dereference from access to field 'pts' loaded from variable 'in'. Signed-off-by: C0deAi --- libavfilter/af_afade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index 285b5b6..7f5106e 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -460,7 +460,7 @@ static int activate(AVFilterContext *ctx) return ff_filter_frame(outlink, in); } - if (ff_framequeue_queued_samples(&ctx->inputs[0]->fifo) > s->nb_samples) { + if (in && (ff_framequeue_queued_samples(&ctx->inputs[0]->fifo) > s->nb_samples)) { nb_samples = ff_framequeue_queued_samples(&ctx->inputs[0]->fifo) - s->nb_samples; if (nb_samples > 0) { ret = ff_inlink_consume_samples(ctx->inputs[0], nb_samples, nb_samples, &in);