From patchwork Sun May 16 19:38:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27793 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2232828iof; Sun, 16 May 2021 12:40:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMX6rWhrhgd7iU8GWkBku3bD2Fc1AcOzLd1HA0E4G7ebD/vd/Kbx+6nyWI2bjWkFpCJo1S X-Received: by 2002:a05:6402:22fa:: with SMTP id dn26mr9301895edb.5.1621194021620; Sun, 16 May 2021 12:40:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621194021; cv=none; d=google.com; s=arc-20160816; b=sKbGlukqrQ8dqOVtfqBE3KNWloZnjUqHyNRHwJwImUweJJwgSgpvfCsDjq3jYTSx+P tD1WiGkWcW2oqXO86y7LQwT2xnYdk0HivTosjK4MWmmqd7phMBJxNAQR2NQzuJPynt6H wvAj1nfS7lRxOchsoUba8l7bbOCnLqhqHO4vXMhCjQxLFmMHOoBP+zBhEKmKVemLSYf0 EwM9aUMQTPIGnfrdw8hPXzQa5AmA6BAmsenneodmu1VY/oQOLK/UwMZmL8aQigER8R9I lgMIKKQYdS4yZjm/TIG5IDQcOS6ueBBcakqzkJe1QCZ6ukfNOru3EJkS23NK3p4L7wad T34g== 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=1D3huO7l9/EUFr1BcyzVqXt3qmvJS599TmBfiLWz6Ys=; b=cJGeK5vxqLuRxqQxcLmTDORa0s/PEdvPhAMsp30AQ/LfpQyBICZaAq1i+93BWdVEa+ JyHRV63amgCRpf+qda2JGitb5LZFWtXrJ9HfXMS+ir/Mrxi7Vn34BPBIZms8soRSpVF2 5NeMHNJRzgkYC9iH1hMeysuTjcO8hfBnXvqvRv28krXKoqq8bnAXE7sSsXlQgV60xKla b5ubRO5qCuSqcdB0ltEGf8kNvZq5FWppe+j2W/HdziL/AP45hApCOmui82aabopk0zeP 2J0BQWBrZ5SPHbifnfgQQfHMRh38yTFDq74S6t3Bgw1bCjBaR3Fo6zx4FD13A99kbJE9 lWdg== 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 w6si13149197edd.329.2021.05.16.12.40.21; Sun, 16 May 2021 12:40: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 D145F689721; Sun, 16 May 2021 22:40:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B198688181 for ; Sun, 16 May 2021 22:40:02 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1liMcM-008hhb-0C for ffmpeg-devel@ffmpeg.org; Sun, 16 May 2021 21:40:02 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id iMbNl8pevljeHiMbOlMDzd; Sun, 16 May 2021 21:39:02 +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.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=g8gZ2V3kerUFJgFHV8kA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 16 May 2021 21:38:59 +0200 Message-Id: <20210516193901.30853-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfAbHLxWKs3SDBMnWmq98ybWTAcZcLNGlEOvkBnwQsky5rrzHdTLNGvt4wbSZanVgoy0z8AY80BGAkag/PyJgDvD/LAzAevEAbTSeDjpAhqRcTdS2hg+d 6ESO8+jwP3wKOfvZN3c//qL2QSG15sbuMCMiSRGs727175ic1Bb93uck Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/dpx: fix off by 1 in bits_per_color 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: QdRiqr32RK59 Fixes: CID1476303 Bad bit shift operation Signed-off-by: Michael Niedermayer --- libavcodec/dpx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 8e77c09bb1..3563bdc538 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -242,7 +242,7 @@ static int decode_frame(AVCodecContext *avctx, return AVERROR_PATCHWELCOME; } - if (bits_per_color > 32) + if (bits_per_color > 31) return AVERROR_INVALIDDATA; buf += 820; @@ -319,7 +319,7 @@ static int decode_frame(AVCodecContext *avctx, minCV = av_int2float(i); maxCV = av_int2float(j); if (bits_per_color >= 1 && - minCV == 0.0f && maxCV == ((1<color_range = AVCOL_RANGE_JPEG; } else if (bits_per_color >= 8 && minCV == (1 <<(bits_per_color - 4)) && From patchwork Sun May 16 19:39:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27791 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2232778iof; Sun, 16 May 2021 12:40:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytCf9VFxumeiu58JCvHV+QP+6YT5ED8ScBKrxqweGmgV5qnsqndHygLptlWg40AcqG+djz X-Received: by 2002:a17:906:1496:: with SMTP id x22mr11510454ejc.419.1621194013103; Sun, 16 May 2021 12:40:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621194013; cv=none; d=google.com; s=arc-20160816; b=FaAMmvQfXyE4ZovIcO0c8UmLuHoLhGGnzVjPFrEq5twRGaZ8q30sRSdgFz/ODeEv59 j4EfMGxjs9OSTgLRITjV2zjqzy3u1/uQQ6s4bz4rHrlTwj69GTidwkngeRhBykFQB6in zvAwwXhipSZ7pchptA8nTFF+xHhXpmXUJ5xLa2FFBUrWK1+CdGzeKWeycOz22MiVZ80Z 1gLlzNWG3fsh3zn1J9Go76chqL0WZINGNRJR+7U8OoHMJiMU/5Xt8Tv6aNQTRJx9gw8E FADi8cQ8fTfxUi87DI8bIM00Ni+G/k8wVoRsl5r244c9N6FlUzx5hW8RAfeEKqrIkyOa FZKg== 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=3W3+ilSannrih6jUHSUnSGGqaHJkGICwWMuC6e85mbs=; b=dBRDlhtFNr6pKaOIYgFnTapi9f2tLLNFz4YPE8b13YyRnVvmLR4Ycqj401GIcxT4DT Qdh+aC1cZKXU2bt6XPmveBVhr2j9PJuIMt3jIjuqNAxjNsPdSQkMsmxCfOC71JOvithU Ka1eD5E1QlyS6rT7bV3uCHzTJqJqUdfw6eZgOSRU2Re7YghNBde4CH0qF0skNOk62aV0 teIouBFEvDoVjmlHW7VY/GRdiWspNTlWPsmHtxUe+9iwDdNPLordSu4OG9tgMZWz/tQJ bfm8ZttlSV+4w6LRYD2Dh7NY77eaXWM82rn7Niwrimbf6UX/waf+DF1Agwwb8PF8LNC9 kr3A== 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 i22si10468060ejp.511.2021.05.16.12.40.12; Sun, 16 May 2021 12:40:13 -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 AEF9B680BD2; Sun, 16 May 2021 22:40:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DFD7688197 for ; Sun, 16 May 2021 22:40:02 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1liMcM-00GG2i-0B for ffmpeg-devel@ffmpeg.org; Sun, 16 May 2021 21:40:02 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id iMbOl8pfVljeHiMbOlMDzo; Sun, 16 May 2021 21:39:02 +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.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=gVfbdM6BT5QwMJtaMR8A:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 16 May 2021 21:39:00 +0200 Message-Id: <20210516193901.30853-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210516193901.30853-1-michael@niedermayer.cc> References: <20210516193901.30853-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfAbHLxWKs3SDBMnWmq98ybWTAcZcLNGlEOvkBnwQsky5rrzHdTLNGvt4wbSZanVgoy0z8AY80BGAkag/PyJgDvD/LAzAevEAbTSeDjpAhqRcTdS2hg+d 6ESO8+jwP3wKOfvZN3c//qL2QSG15sbuMCMiSRGs727175ic1Bb93uck Subject: [FFmpeg-devel] [PATCH 2/3] tools/cws2fws: Check read() for failure 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: NwRV952cYlYS Fixes: CID1452579 Argument cannot be negative Signed-off-by: Michael Niedermayer --- tools/cws2fws.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/cws2fws.c b/tools/cws2fws.c index 7046b69957..9ce321fe20 100644 --- a/tools/cws2fws.c +++ b/tools/cws2fws.c @@ -89,6 +89,12 @@ int main(int argc, char *argv[]) for (i = 0; i < comp_len - 8;) { int ret, len = read(fd_in, &buf_in, 1024); + if (len == -1) { + printf("read failure\n"); + inflateEnd(&zstream); + goto out; + } + dbgprintf("read %d bytes\n", len); last_out = zstream.total_out; From patchwork Sun May 16 19:39:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27792 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2232879iof; Sun, 16 May 2021 12:40:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUWkXMX62NPtOTQR4XqAOesJFrSGaunIuyZILajUbJaF9Lc4+e9fEfxQ5FMwwHjdVVb1o7 X-Received: by 2002:a17:906:e09:: with SMTP id l9mr5503903eji.528.1621194030066; Sun, 16 May 2021 12:40:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621194030; cv=none; d=google.com; s=arc-20160816; b=ymm3SVw9WRP2MIJYnzPdBxUnvpd7zlWCXUOPRaNJ2sppZ0YTlfu2cCGAXhX0qpej52 XvXcAhyEFWs4bT+jadihvGBEFB+P83gzEswRmxFr517oRcqafnUcEYtXq17r8+OKPy36 1Pnjt0ODAQ/kYaeYUW2aFk+hjKGNGWn+1WdouvpqAZrxYSIk/PlsUPBNC/2/h+Iw6VE2 N/r0pozEM+a/qj8jCNuih3YV+b+7x9FNb+ycbDZJok6fd4NdkAOKBcmXskPya2MOnSj2 /Mj/D3AHbE7hR45aQUwZmnf5EsCdjgjEDUShPftIGYyxoy/cOfmcxhUj49xjOfin4HeH 9Gjw== 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=iJfwIWcyh18QZAS0SRPxpu5sniPkrZe8tn5JS2zZGYY=; b=LU+vY64gAoAt3c7vW/hGvhSE66gmbpK3QmgFz4uUoII64Hy8K01rbHZ12M/CU26Qhs Alobj4EBQ7zGKiiN/X3rK6NOc67XS44rKKBAKDk6YZFOkCRtvutReF5hMEXfKJZXle/L cmgIyKcq+VJhZynHwYndEAlMUsd0yWiYyxHxbUA7e5AMZQKTw/ay584OImVYBSieZ1HH lKF78ayOsRDS/PDb5Kds1EbFBRe7Lfk5gTSlG4VPBgE2Xw4cLywnGR10XCF828bXvwno 8vQ+zBWKrhHiN7CL1kucp1XCpAm/3jNq3WwEgOHCRlC+q3VWW8grMj/pdb3Lf361tDTL d0AQ== 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 s3si4810342ejx.462.2021.05.16.12.40.29; Sun, 16 May 2021 12:40:30 -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 CA36968979B; Sun, 16 May 2021 22:40:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76AA468804B for ; Sun, 16 May 2021 22:40:02 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1liMcM-008hpn-0C for ffmpeg-devel@ffmpeg.org; Sun, 16 May 2021 21:40:02 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id iMbOl8pfhljeHiMbOlMDzr; Sun, 16 May 2021 21:39:02 +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.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=LgM8dMddOirLtSYyuTEA:9 a=pHzHmUro8NiASowvMSCR:22 a=Ew2E2A-JSTLzCXPT_086:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 16 May 2021 21:39:01 +0200 Message-Id: <20210516193901.30853-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210516193901.30853-1-michael@niedermayer.cc> References: <20210516193901.30853-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfAbHLxWKs3SDBMnWmq98ybWTAcZcLNGlEOvkBnwQsky5rrzHdTLNGvt4wbSZanVgoy0z8AY80BGAkag/PyJgDvD/LAzAevEAbTSeDjpAhqRcTdS2hg+d 6ESO8+jwP3wKOfvZN3c//qL2QSG15sbuMCMiSRGs727175ic1Bb93uck Subject: [FFmpeg-devel] [PATCH 3/3] avformat/fifo: check for flushed packets and timeshift 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: oQXkG+iSGbEG Fixes: CID1464151 Dereference after null check Signed-off-by: Michael Niedermayer --- libavformat/fifo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/fifo.c b/libavformat/fifo.c index 620fffa032..50656f78b7 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -593,7 +593,7 @@ static int fifo_write_packet(AVFormatContext *avf, AVPacket *pkt) goto fail; } - if (fifo->timeshift && pkt->dts != AV_NOPTS_VALUE) + if (fifo->timeshift && pkt && pkt->dts != AV_NOPTS_VALUE) atomic_fetch_add_explicit(&fifo->queue_duration, next_duration(avf, pkt, &fifo->last_sent_dts), memory_order_relaxed); return ret;