From patchwork Wed May 18 15:55:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35820 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp400120pzb; Wed, 18 May 2022 08:55:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySv5BmEaqO+BDCw72vkJwLpV970cA7resNs7RuxtCM6Yh0p5i+QqFPw5dxNQs1+uHIOR5v X-Received: by 2002:a05:6402:5242:b0:427:cade:4737 with SMTP id t2-20020a056402524200b00427cade4737mr434840edd.398.1652889324047; Wed, 18 May 2022 08:55:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652889324; cv=none; d=google.com; s=arc-20160816; b=bqJtHmoY6Nwj3cmkWb2Uv0ZfWy1AYyVtVRi76pB7qKhRNhwqNkiqrVgJMba+V+Ig01 EWGrKFDeemaJTzH11iQQNKK2ttpQsoReuMZKsW2iKwPPFVr1Jp+7uFG9o+h2ptr91sR8 64hZHPmofUxI0g5Ivm0RvhJvsN0RM/Pe2azFepQ4NqrHmMUon4KZZ1T6L3H4DJWFQ6Hg gD/d1yNliYwSvjyh30mU6WPssxn/GApz8oirDhXQXzFJwxt82MuIg2xgbOp+8CLqBxLX l2WjiqaeLjUdQNSsaJUxpBrGrHisvDSm8/LWGkHcnd0vQoQUO8IO/RWTeL0m4NLkGweZ peKA== 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:message-id:date:to:from:delivered-to; bh=w59M8hJVR3e31wsHXAoJ+qP2Lwen6MCzAY0KoBBdtwg=; b=f95NoGiTtszBHhb9I3bgBVVTsEiyjv9X4NKNJw7bJJvyGo5jeTbZOvvwKYLJ2X0RZA WI47QuAat38iC28EDIU+CRgZ4uWA27K1imQDMExkX2B3QjElX8PqgjB+kJLMG+K0SwyH qmyNvDaJPNkBetjNsdr/Z97gSxWFNxKu+qQbDlVPmIrt9h7BdyWcYL0u2V4SU9g8tg2g qq/59tYiI55MT4tXM6XcNINFDWHzBucINRBlRLBFB2kklLfWiRMOXDJ+KPerKMA0ZSVa 19jMG+9iXmyPJnNnF5KhieHmtXRcfIjYneHEScoKAcVQPUy5rpBXoxsWdQNlT8gWjzmu 2JyQ== 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id oz36-20020a1709077da400b006fa88dad76dsi2757152ejc.193.2022.05.18.08.55.23; Wed, 18 May 2022 08:55:24 -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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D44E068B495; Wed, 18 May 2022 18:55:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C98D68A987 for ; Wed, 18 May 2022 18:55:13 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nrM0w-0000LK-D0 for ffmpeg-devel@ffmpeg.org; Wed, 18 May 2022 17:55:06 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id rM0rnSf6v8s8UrM0vn3Uz9; Wed, 18 May 2022 17:55:06 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id rM0vnQ2xjOPqFrM0vnHco4; Wed, 18 May 2022 17:55:05 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=628516d9 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=haC7fBEpKYnKb-WzXFQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 18 May 2022 17:55:04 +0200 Message-Id: <20220518155505.4912-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfMSp87ljiYJD5RfgbFfdocKlfqvkAiU/rYdWB2U9WSwjJEi9MgZA5YATkmXUXkKl/LgLTllzKa+zDiO3RyVeDYywd2wdqqIqjmGXaVpr13fv1p/P345s QOM6yp/8edYF2PSdP+E+8ZYnNSWmFm9Xw+PN1eIHPUK6GXjj45ZaYDaYmTDx7Pc6h1ralrRDjUncFA== Subject: [FFmpeg-devel] [PATCH 1/2] avformat/http: Remove always true non NULL check 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TeFgEEIvLBfW Coverity uses the logic of "Comparing options to null implies that options might be null." But ffurl_connect() checks for NULL already and uses &tmp_opts Helps: CID1374122 Signed-off-by: Michael Niedermayer --- libavformat/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/http.c b/libavformat/http.c index c8f3f4b6a3..81c3048934 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -692,8 +692,7 @@ static int http_open(URLContext *h, const char *uri, int flags, if (!s->uri) return AVERROR(ENOMEM); - if (options) - av_dict_copy(&s->chained_options, *options, 0); + av_dict_copy(&s->chained_options, *options, 0); if (s->headers) { int len = strlen(s->headers); From patchwork Wed May 18 15:55:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35821 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp400512pzb; Wed, 18 May 2022 08:56:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzWe0Vk+GOJIyoC1VfUykYyGZ26OlT/DUeQsWSYM/bNREnjesBEu0ZvNOOQK6jqyyk+oZT X-Received: by 2002:a05:6402:5193:b0:428:414d:e20d with SMTP id q19-20020a056402519300b00428414de20dmr427134edd.173.1652889381441; Wed, 18 May 2022 08:56:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652889381; cv=none; d=google.com; s=arc-20160816; b=XSvQnz/RuohOqanMvhOnJeoOmTFVmeieWdZ6GOkwqZRE6CyMIe2U8MrL6SAEeRh0M5 PBXEL6W4AbQhOmtcyUEgHqbb3ENJdazyHxJqJx73OuB1NFG9g7T317SKZ8j/zBmrP3Aw Ymu8A6wH/zHaAamFmevLasdRzWK1RIlVo/EFXSmFznbN5ampOPUB79dcQc0BTN0NGSZr cytSuJkV1LfxmGFJugmBKOiIqnPV/mbP/3IHe721Leg3yDaGfZILDOcWhN9IehlD2sXc kRdG3VIjrPQjl1FIekUWDdWexXa0vcPacJV+DMjXadARaVGr7LdEbywAPKWezwIaEaOU KPtA== 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:delivered-to; bh=KPF5CgUFfghlMerrDAXaKdftVyD9nZ6M5Wbfac3j/Rw=; b=MqfPDZk97S6LKQtP/asibtSazlleXk3erKts6s/BKnmgbJTd1roNcyFix4HHDBZrmC liLohWNGA4TuJ4SnyCeOzvizbb9UtPbl0cFQxERzV1ciCIJwwgP2IgyQhI3QQaOEQYSn 6PD9Eh4YSnC5V6MEKNhf7EH71Ark5ahQ/RrecF72MePnCIbN11WSBY6Fgzu7f45CwXzZ gVP0aKAq2t2lUisM36gRHDSpq4YZjmH8xXTYbNnXbDyU6Yt7DA5c6sdCYRoFMp0U8R6Z NJfs/tkDOI+ZhdX3IT1xKqjWSr7VfAzPJlpw+APQVnq1m5ao8xdIMMIMssnrNU3QgI3S NlOw== 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dn24-20020a05640222f800b0042ae30a77f2si2491126edb.398.2022.05.18.08.56.20; Wed, 18 May 2022 08:56:21 -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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1035F68B4A0; Wed, 18 May 2022 18:56:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B51C868AEB2 for ; Wed, 18 May 2022 18:56:12 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nrM1u-0000LL-5T for ffmpeg-devel@ffmpeg.org; Wed, 18 May 2022 17:56:06 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id rM1unSgcF8s8UrM1un3VBj; Wed, 18 May 2022 17:56:06 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id rM0vnQ2xtOPqFrM0vnHcoG; Wed, 18 May 2022 17:55:06 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=628516da a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=sBufJegdPslRPpamdmwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 18 May 2022 17:55:05 +0200 Message-Id: <20220518155505.4912-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220518155505.4912-1-michael@niedermayer.cc> References: <20220518155505.4912-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNBG5231C1Ij4VttodjF9mKm2Lw9ysVk3nr9czO3KJDmEkCTxwRCnnHpEcEX4/2BoHepBcEPGweBMwzwgADkUL4LhSZ9aCjRfvNWbuJ6agrbSRlSFqRV 65QThEkABO47D6iACLonQTPR8Tj7bfiCxloXTa39qRf2yN6ZNqOGxfFDSaeiXRYGPWV46Dkr7tGfKA== Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_signature: Fix integer overflow in filter_frame() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lepDj+85kXS/ Fixes: CID1403233 The second of the 2 changes may be unneeded but will help coverity Signed-off-by: Michael Niedermayer --- libavfilter/vf_signature.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c index 4ca57ebf1d..66149dcc01 100644 --- a/libavfilter/vf_signature.c +++ b/libavfilter/vf_signature.c @@ -219,7 +219,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) dw1 = inlink->w / 32; if (inlink->w % 32) dw2 = dw1 + 1; - denom = (sc->divide) ? dh1 * dh2 * dw1 * dw2 : 1; + denom = (sc->divide) ? dh1 * (int64_t)dh2 * dw1 * dw2 : 1; for (i = 0; i < 32; i++) { rowcount = 0; @@ -245,7 +245,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) } } - denom = (sc->divide) ? 1 : dh1 * dh2 * dw1 * dw2; + denom = (sc->divide) ? 1 : dh1 * (int64_t)dh2 * dw1 * dw2; for (i = 0; i < ELEMENT_COUNT; i++) { const ElemCat* elemcat = elements[i];