From patchwork Tue Jul 20 20:29:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28983 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp5658324ios; Tue, 20 Jul 2021 13:36:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNCcoM+dl+PIqenbxZpsBEqb7JggF78z9BLzlUSJ51fr5uujsTUKYUXa9DVDskBxrn+MfQ X-Received: by 2002:a05:6402:d4c:: with SMTP id ec12mr44421795edb.246.1626813392441; Tue, 20 Jul 2021 13:36:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626813392; cv=none; d=google.com; s=arc-20160816; b=x34hg9qSWzZgxhc4G2ks07ilnXQO+RhNjgE0ysgLgX7IGy+dthbabI6nl38QGKrUDc bBtdjhdn2wlRV1rVQ7b2rjcD/WLSFoHaHiQnYvq+KgvQI9bgVht4FbQVoNgFTcCE60Ub /dZN+EJYcYtnNVfe2SVan/ulBM3tVApmEOHEYB1XD/uWTaMbHyrCeCKzIbxxLMxRag+g dMNB+h0aR+3FCFJ26s0DzbkreAdlKJLlGQ3J0++cAXIsbYhq0V5xst94kXcHRA7LFlBo roSpilXIOMCjWIz+jzPsaPNEaalXrButipu3ytmjKkUeaGYqSJQHO33/FJbMa+dAs8SF YomQ== 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=BKxqAT1nx+Wn6JMcKwj2ySPvRG4jQw69pLttgGAhZPc=; b=UC01ZsUAcwyHBkGyQyIJN5960pphLKaG3bKpeQJzItIcy/S01f5RRjIomVu/y16pGG H9oc3x11igQsmFrzuVUcAU7rAgXCdzb9HRhlJ79XISBqhvAw8b84jJbtSR0hiqLDU9k9 9ONwZYXW6Bd81ItacaP35A217kObcBSsN4HLIyqyJAVFjQMj2bqBIqShzGA28uybRWYE HfYqTnx5UWUZOY0D8kYv/30++A6CmFSWXs+MXU4wPQ3splwkz6s+QL361Fi9KEXzWoOG CtSvHmPGkEXIMkc/N7lkCsjaFaZ/xak0m7jXSAklZFupGbWajgUUI95JUzBgqgLY2Iq0 iADw== 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 l5si26970920edv.367.2021.07.20.13.36.32; Tue, 20 Jul 2021 13:36:32 -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 59ABA68AA33; Tue, 20 Jul 2021 23:36:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7153568A9C8 for ; Tue, 20 Jul 2021 23:36:23 +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 1m5wO3-009hxd-0E for ffmpeg-devel@ffmpeg.org; Tue, 20 Jul 2021 22:30:43 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 5wN4mFNbvljeH5wN4mRWi5; Tue, 20 Jul 2021 22:29:43 +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=nZOtpAppAAAA:20 a=vsNmR7GrC5s1ARwY_z8A:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 20 Jul 2021 22:29:39 +0200 Message-Id: <20210720202942.8574-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfEwUiH3ZSFrn+ZnK/S5uVhxNoP+CJ4LremiwY4nHe7REYpgFl3KH5goaaSNtJLrRJLQvWxz4sQgjmGfwMcyNZmxo/wPFjdZKcgvRw+ruQ0tF7A6vSMfR C45qFAGN1ioxLOh2E840WjggqwSed73GM2RZm0+sa7Qly1TGwYhmoSjd Subject: [FFmpeg-devel] [PATCH 1/4] tools/target_dec_fuzzer: Adjust the threshold for VP3 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: wNy+wJMvBNWY Fixes: Timeout Fixes: 35855/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP3_fuzzer-4851183540895744 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 3d06630e46..8e6c67efe4 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -200,6 +200,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_TSCC: maxpixels /= 1024; break; case AV_CODEC_ID_VC1IMAGE: maxpixels /= 8192; break; case AV_CODEC_ID_VMNC: maxpixels /= 8192; break; + case AV_CODEC_ID_VP3: maxpixels /= 4096; break; case AV_CODEC_ID_VP4: maxpixels /= 4096; break; case AV_CODEC_ID_VP7: maxpixels /= 256; break; case AV_CODEC_ID_VP9: maxpixels /= 4096; break; From patchwork Tue Jul 20 20:29:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28984 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp5658214ios; Tue, 20 Jul 2021 13:36:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcbjL83bQ1V252SUohAlOVrv3TQpc7brUc6FXzYVHeHWBARf4l0jDOD9/0Xs4yIzK1qjyU X-Received: by 2002:a17:906:9d17:: with SMTP id fn23mr35650692ejc.191.1626813380843; Tue, 20 Jul 2021 13:36:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626813380; cv=none; d=google.com; s=arc-20160816; b=hYgsJ1xaZdgg/AXNi07rH1xWPugJcgQh6FOg20DLUl+1G19pTUVbSNsCPPW0QmidKY TDxGwHQPyrdfl9lwR/iProg5BiT16oLi8F1LbD0W/3w6cAp8D14P3aLRIFSYfOgd5Go0 iHZ1ZVJRJeFqyuk0Bv4Rrf92qi8im0IqCddLQRk+yu/VUS+L9lAItUdgveEHzxmadWW8 ybhW+zJOSu4R5VUAVVOUsZQCoy2MSOfZRIa/vWlqOiyex5w14AONsG7+c77W7WW0HFnX V1UQ/U2SrLw09EbVPDIa/qnrg3V04IkCKbAX2MTmE8xI45S0yUtmac0Jytn9yh/iwYYh EB+w== 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=gnNOr/4xFvU2buCx/PODdwshBi9YwpBbI/k+IuQcUe8=; b=ZLvsi5L8pwBL2DXvAPS23VGbtvvFeJmHmIehcF0TAxsbGi14amwMutmBd1CKR4537E dhCJzUQlmGQFs9K7aa0dggmx6pFOCCx4Wit4nDOnOaEsBsF1Gi9Y+irdACQpJKcAckDV jMuzIAcP1lp/12NGuvTeKqrViYm3qi1IXu9blwYjCPzK0w0gYxdpxMMu1tKj3KqYDHqS kdyrC44WcRpTQjdMAzSGefkNqEHcz1oYGOWH3/8irjFgVIWpoKmLbDnoI9DZ4hSTI5Ex hEKkCeKccQHN5P4Y3j3CjnH7pQ/CyznXXOQ6mj9dVtlKwWYyZrrsjiG3MRcHEzioo6fj I2ZA== 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 zo9si26300918ejb.628.2021.07.20.13.36.20; Tue, 20 Jul 2021 13:36:20 -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 514B9689E56; Tue, 20 Jul 2021 23:36:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 46554689E56 for ; Tue, 20 Jul 2021 23:36:11 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1m5wO3-00BPid-0C for ffmpeg-devel@ffmpeg.org; Tue, 20 Jul 2021 22:30:43 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 5wN5mFNe8ljeH5wN5mRWk1; Tue, 20 Jul 2021 22:29:43 +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=nZOtpAppAAAA:20 a=Yvk6vfKxCsIJV-Jsw1EA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 20 Jul 2021 22:29:40 +0200 Message-Id: <20210720202942.8574-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210720202942.8574-1-michael@niedermayer.cc> References: <20210720202942.8574-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEwUiH3ZSFrn+ZnK/S5uVhxNoP+CJ4LremiwY4nHe7REYpgFl3KH5goaaSNtJLrRJLQvWxz4sQgjmGfwMcyNZmxo/wPFjdZKcgvRw+ruQ0tF7A6vSMfR C45qFAGN1ioxLOh2E840WjggqwSed73GM2RZm0+sa7Qly1TGwYhmoSjd Subject: [FFmpeg-devel] [PATCH 2/4] tools/target_dec_fuzzer: Adjust the threshold for VP5 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: H7I5kS9WjEia Fixes: Timeout Fixes: 35793/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VP5_fuzzer-6492854393372672 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index 8e6c67efe4..e3b65dbd1b 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -202,6 +202,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_VMNC: maxpixels /= 8192; break; case AV_CODEC_ID_VP3: maxpixels /= 4096; break; case AV_CODEC_ID_VP4: maxpixels /= 4096; break; + case AV_CODEC_ID_VP5: maxpixels /= 256; break; case AV_CODEC_ID_VP7: maxpixels /= 256; break; case AV_CODEC_ID_VP9: maxpixels /= 4096; break; case AV_CODEC_ID_WAVPACK: maxsamples /= 1024; break; From patchwork Tue Jul 20 20:29:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28985 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp5658705ios; Tue, 20 Jul 2021 13:37:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyj1KLzdJJXiZt1J0afJN+dpU89VFR+3XD6tbC8FKY0OyrK2vG5kTs+oldsvffBIHYtHCUV X-Received: by 2002:a17:906:c107:: with SMTP id do7mr34963842ejc.469.1626813434682; Tue, 20 Jul 2021 13:37:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626813434; cv=none; d=google.com; s=arc-20160816; b=XubpB1rqcCYOQJ8XkvE+fcsuJ6/nkfaibbos6dk6D0zj4mC1zCV1e10HeNSnVhnqcu vgw62BkIPHKGrTjg8gbrrJMcik1nTzqUF8n6+R1iwxBV62292pJ+SJ6uwTR69sTPajzb hQY12qw8Z2xmzQyUFi9dzGRyZiCZ5+Eq6YQ4MR2imKDrt6pbTkTSkED6teYg2XEelTZS fsBqAx2pFKK+wTOllWaf3BY9hO/2j6cg1PSMI/kabvmghyggL7GdbYBgu2Zm7KCZ9+V7 qMhWrVJNpVAKp8ecPHAuQBjF3V37fFaji5ufjiIrdspWS570ooB/T5CWor5Ihk8aLFyA L6TQ== 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=0hXalosy76Cv8Z/UgmIpTrsfudrmRtPbeHG6M6WSr9M=; b=ktDrj/F0BrCUJnMcHEZ8AZW3W6TiLrPTotbNDJiFNvBIJngYp9Qy1eXxbhtt3MQkyt e8gnwAvqQblllxhI+punfgXAfMtIKm2GoLXYX8c7KdyGb0tWQ4LA90rxZNWavhK1KfCz 6xXwFxiWVRXjIi3OVORgUEnTeDy/U/iM0QlQJ2XeasUg6kdmce5iYWeiaNRuQdcKiIVb yDuboMaicOBL1vi/pudd1hO/Oa7RmerOaoBKSInmv47M3Glt1uEW6VAm4ObhZX9iNgeW rLShdtnZG513ZSrNIsJqDXY6SDXyjtiRiBcbiVvwgXx9UwAnaMyvSqU2uNacvRbTadnR f9Aw== 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 t1si692819edd.382.2021.07.20.13.37.14; Tue, 20 Jul 2021 13:37:14 -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 59C0C68AA4A; Tue, 20 Jul 2021 23:37:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BF59689E56 for ; Tue, 20 Jul 2021 23:37:06 +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 1m5wO3-009hxl-0E for ffmpeg-devel@ffmpeg.org; Tue, 20 Jul 2021 22:30:43 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 5wN5mFNedljeH5wN5mRWkS; Tue, 20 Jul 2021 22:29:43 +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=nZOtpAppAAAA:20 a=uvVtbdjT_8Hk_rnc5QEA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 20 Jul 2021 22:29:41 +0200 Message-Id: <20210720202942.8574-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210720202942.8574-1-michael@niedermayer.cc> References: <20210720202942.8574-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEwUiH3ZSFrn+ZnK/S5uVhxNoP+CJ4LremiwY4nHe7REYpgFl3KH5goaaSNtJLrRJLQvWxz4sQgjmGfwMcyNZmxo/wPFjdZKcgvRw+ruQ0tF7A6vSMfR C45qFAGN1ioxLOh2E840WjggqwSed73GM2RZm0+sa7Qly1TGwYhmoSjd Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/apedec: Fix integer overflows in 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: dPPY683AVt+V Fixes: signed integer overflow: -2146255836 - 197885745 cannot be represented in type 'int' Fixes: 35911/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-5799270526615552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apedec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 022a6f9398..2bbc18fee0 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -909,22 +909,22 @@ static av_always_inline int filter_3800(APEPredictor *p, return predictionA; } d2 = p->buf[delayA]; - d1 = (p->buf[delayA] - p->buf[delayA - 1]) * 2U; - d0 = p->buf[delayA] + ((p->buf[delayA - 2] - p->buf[delayA - 1]) * 8U); + d1 = (p->buf[delayA] - (unsigned)p->buf[delayA - 1]) * 2; + d0 = p->buf[delayA] + ((p->buf[delayA - 2] - (unsigned)p->buf[delayA - 1]) * 8); d3 = p->buf[delayB] * 2U - p->buf[delayB - 1]; d4 = p->buf[delayB]; - predictionA = d0 * p->coeffsA[filter][0] + - d1 * p->coeffsA[filter][1] + - d2 * p->coeffsA[filter][2]; + predictionA = d0 * (unsigned)p->coeffsA[filter][0] + + d1 * (unsigned)p->coeffsA[filter][1] + + d2 * (unsigned)p->coeffsA[filter][2]; sign = APESIGN(decoded); p->coeffsA[filter][0] += (((d0 >> 30) & 2) - 1) * sign; p->coeffsA[filter][1] += (((d1 >> 28) & 8) - 4) * sign; p->coeffsA[filter][2] += (((d2 >> 28) & 8) - 4) * sign; - predictionB = d3 * p->coeffsB[filter][0] - - d4 * p->coeffsB[filter][1]; + predictionB = d3 * (unsigned)p->coeffsB[filter][0] - + d4 * (unsigned)p->coeffsB[filter][1]; p->lastA[filter] = decoded + (predictionA >> 11); sign = APESIGN(p->lastA[filter]); p->coeffsB[filter][0] += (((d3 >> 29) & 4) - 2) * sign; From patchwork Tue Jul 20 20:29:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28986 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp5654590ios; Tue, 20 Jul 2021 13:30:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwxiVWMrW6pS2dM6S2pPO9XsZhTbjlYXATcj1oYwi7ThFIpqg1fIvw7962P/Pc4YHUHMQlP X-Received: by 2002:a17:906:3042:: with SMTP id d2mr35392472ejd.234.1626813054845; Tue, 20 Jul 2021 13:30:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626813054; cv=none; d=google.com; s=arc-20160816; b=YbbH6x9ejrvqF+ZKV3ZSDXjP1/biQkTddZQlKNVsaAGIc8UiZLiL1ntR3HmpSw3R4R bI04cCe1vY5lGuuSvUB63fwWibTgSk5sbwBnPCY/DX5ND6t4Y7dAqnm+DqKADgOWOF4W c1PrrHyuIuhlgakZLj9Ej5Wj0eLQzPe/JNpNZSZPF6UGIkMB63yqr394rqxK62ftZJbg LO8pDEbZKixM7kSXRk+Qm22Xc2xO6jYD/hhyMqCMki3Sv0bu+Q0akzCkS1LsX3kS5dhL ABCDN9LUo/Cz0dnn2eUseNYF+coSREZy9SgO4I5TPxQineQWi8AwSA0izAgrF0BV0S1U +i9A== 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=xBsdn/U9Iw4UN5EtO/SC0wlIIeaR9KV6/hFlg/LBMlQ=; b=r0s+obHXSHUd2bqLbr4FvWp7xRosT2kQHhiqYbksepxVBxm1vG2HbxNrDrEN4Q46lA Qwlytg+pm/2z8NJPuqrAAUwJxynT6LajNEwgYkci3ttiLdUVIcx/6tyVa3Mu5vNA295n OY01PaHpcWy8J/bZd58Y+RCDwuEHnYhOVvadeIN9cDdZhLUf0L9feiHsDTdYzobL2ump A3bQDv4IJIn2vwM7WVO/+eBOOpnt/ecy2FCp6XpmJXwN4cK7/W7mW79/yTI4uQizg0wg D1ivglNe3RA5dLzeUFkJy3k4bp5FVg4BsXtHFq5d97/R+c5a50wOpSH8z6+BhJqKZNtn Fagg== 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 v16si3252047edc.281.2021.07.20.13.30.53; Tue, 20 Jul 2021 13:30:54 -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 D8EAA68A985; Tue, 20 Jul 2021 23:30:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5E5E68A7E9 for ; Tue, 20 Jul 2021 23:30:43 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1m5wO3-00CX8u-0D for ffmpeg-devel@ffmpeg.org; Tue, 20 Jul 2021 22:30:43 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 5wN5mFNf7ljeH5wN5mRWkv; Tue, 20 Jul 2021 22:29:43 +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=WOwssihy0adnk52P:21 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=yEkePO1MDcaG1OJzFoMA:9 a=h9g_fFhjIUyzDAgiCCcC:22 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 20 Jul 2021 22:29:42 +0200 Message-Id: <20210720202942.8574-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210720202942.8574-1-michael@niedermayer.cc> References: <20210720202942.8574-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfEwUiH3ZSFrn+ZnK/S5uVhxNoP+CJ4LremiwY4nHe7REYpgFl3KH5goaaSNtJLrRJLQvWxz4sQgjmGfwMcyNZmxo/wPFjdZKcgvRw+ruQ0tF7A6vSMfR C45qFAGN1ioxLOh2E840WjggqwSed73GM2RZm0+sa7Qly1TGwYhmoSjd Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/targa: Do not return images when there is no image in the tga 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: 3EQ73Ci1Eate Fixes: Timeout Fixes: 35877/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TARGA_fuzzer-5407292819374080 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/targa.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/targa.c b/libavcodec/targa.c index 3502636c16..221fcc956d 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -176,6 +176,10 @@ static int decode_frame(AVCodecContext *avctx, if ((ret = ff_set_dimensions(avctx, w, h)) < 0) return ret; + if ((compr & (~TGA_RLE)) == TGA_NODATA) { + return avpkt->size; + } + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) return ret; p->pict_type = AV_PICTURE_TYPE_I; @@ -242,9 +246,6 @@ static int decode_frame(AVCodecContext *avctx, } } - if ((compr & (~TGA_RLE)) == TGA_NODATA) { - memset(p->data[0], 0, p->linesize[0] * h); - } else { if (compr & TGA_RLE) { int res = targa_decode_rle(avctx, s, dst, w, h, stride, bpp, interleave); if (res < 0) @@ -289,7 +290,6 @@ static int decode_frame(AVCodecContext *avctx, } } } - } *got_frame = 1;