From patchwork Sat Oct 30 22:30:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31259 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp1069978ioi; Sat, 30 Oct 2021 15:37:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzs628e6LJkYS17ngCukonOutdc2j01Mr55Roq4oEUz+yIgSOcpvs8TmI4eZD3kbXXT6VhI X-Received: by 2002:a17:906:7d09:: with SMTP id u9mr24878268ejo.120.1635633476163; Sat, 30 Oct 2021 15:37:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635633476; cv=none; d=google.com; s=arc-20160816; b=eaR5AQcospEyk1GRr+zUamf2aQw07A0ZEDBda1o4taqMQKMQ0CfMk+jYzXfZ6/ZOFE icxl6Bd8/Q7eDXHaOttlZcFrfgWCZYpuAvcoc+wGPnTe0dFvNOQ1niht3SgNcMVrf6fl nKLvPjZXCQsLe4oTD5f7LZaqjo1sVG2Jr8xbhk/aLsXZZsldmkzOX1YU5zQAENM27lfb XNk11Z/kaIKEofdLFCiM/oOu5OzCCbwMfqn3RtjNlWGO3C4Sg3MNd3WvsgiNX7dZpNxk U2Z9EuBmZfItNNcxvlMHdRksP7G+gGlWBIfoukUhceCAeEideBW9Qqf7aZpcBEaCBLEL I0/g== 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=m9arKJIKa+A14YLyVOlJ46wQbfte9GbVyBfD/sE/dyU=; b=D05HZA7DpagGWdX/q4pJ/VYstJmFaqByTTicwQUCypoacNUwUVEB3b1WESOjn2aueb /x68p3SMicatwuDOY1/P9Jlox+teoyd9zdnAsOjHJ3H6ub8+wbMBvu6wssdN7YyRfeWN Gj8+Gr1PU+t2KNWI7JaaY6DPg8GmEk/b4yXFASFWFHHl+pxJ0qD909dZVVqHmkYDUePi kNIGhtELbUfsyXZnZv19MYarkdjRUJ2NuSRceWz/ep9/Dd9IU7zIQTdyPB53aEn/AKTE eAzY/ygoN42yW1vDLac74eGIUT2+mNiIxwD+fyuzezOHoaTCmKpWiOrP/LepTxvkvvBw 5W1A== 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 ht13si6833392ejc.165.2021.10.30.15.37.55; Sat, 30 Oct 2021 15:37:56 -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 0ACB368A71D; Sun, 31 Oct 2021 01:37:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6A4568A101 for ; Sun, 31 Oct 2021 01:37:46 +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 1mgwtG-001zK1-0D for ffmpeg-devel@ffmpeg.org; Sun, 31 Oct 2021 00:31:54 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id gwsHmPaZkSgGFgwsHmSEeG; Sun, 31 Oct 2021 00:30:54 +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=f8Q2+96M 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=LKKpQugntbfY1iwRsuwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 31 Oct 2021 00:30:51 +0200 Message-Id: <20211030223053.32745-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfLO5n4TR1sC63y1fVTohlGNhDk8ezKGkYofnkeMBNNJkFgORJP9kQP5nIWFOWedZZ7gjM6N2KG4pJrFLTfW6LihINAkv3aUGFqSTUC5sddhlaxUxeqcj 3opJUnKVcIds+uE2uZlXizkFWe8W4mB4i5RTT0LxPa84viH/sQwJYy4M Subject: [FFmpeg-devel] [PATCH 1/3] avformat/aiffdec: Check sample_rate 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: Vo0pCQ/jpFjr Signed-off-by: Michael Niedermayer --- libavformat/aiffdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index a826bc998ad..14063474260 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -120,6 +120,9 @@ static int get_aiff_header(AVFormatContext *s, int size, sample_rate = val << exp; else sample_rate = (val + (1ULL<<(-exp-1))) >> -exp; + if (sample_rate <= 0) + return AVERROR_INVALIDDATA; + par->sample_rate = sample_rate; if (size < 18) return AVERROR_INVALIDDATA; From patchwork Sat Oct 30 22:30:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31261 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp1070116ioi; Sat, 30 Oct 2021 15:38:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKJOnGtc9yK3EIhPGKOPOmPmC2IKXiuhgdlpD9YJiGGyq9G4gsuYYIiSeCiA69KwmC/32H X-Received: by 2002:a17:907:a414:: with SMTP id sg20mr24476222ejc.398.1635633495412; Sat, 30 Oct 2021 15:38:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635633495; cv=none; d=google.com; s=arc-20160816; b=x9ugQvwGIUU8qU+IYLKjganVT0gmh85+kqq++2wqVAXQ8yj1qjqJDqPot9CxkGc/EE +EuIYUWiHtwcnlHjr3nRTaOFJJl+j+diLGqV8JWQr82FJd3hW4kifVcIE8fz6N77MR5n orJaVMrXXD+1qZPLhHEQ9JrGtVu3yhtS0e8SH/YTJJ9iw6Wx2i1vdlsSYJ6QcL6dCXOj Lh5CHmkIgOvHfzrtT8Wa7cfiRk6VnmfGW1K8/5Ua6xeRUaZWqW+aFgRmFkP8LyKCauie v/Pji1KtKWf+j36EvxMfFf0MqpqIP+ORYx1BKRnYvlHFccKZTPZkk/jAfj8vqJd9tiZB LySg== 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=jAqqLXIRJfOkwfVrTC97Bobx0ggsQJiYykhagDm5jHk=; b=UanzV/x2M1T0M5vMPzmGd9VU7Uvi7oskiFoKLfQn93LIvNg2xb0N4UuXsb3K4FbD+9 FiPA/76QY4ZdYnthsxmT8hUe8TXEriHRUXjhffQQ9g7WIaTQGGATRAowHgpTMdqaQ/PT vXCO+CTO2nEUpbRb8KWTw9U71wwp8ir8YcT/U/5LtnrcyHlhr1nuH2oQW5+oN9hkGxx4 F9FJ1hLF8iqOFTLU/xofgP/QIfczJ7euwGH12IoDN+asdhdPyfb5riGzuf6maUvA+9/I GyHd88XeHtbRoq07O65+Z34Mc/jUhRgdMzgHLe5gI6BwCIKxyZv8DKkILeHbwemwTOL/ pgDQ== 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 gn8si18628040ejc.193.2021.10.30.15.38.15; Sat, 30 Oct 2021 15:38:15 -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 1779968A266; Sun, 31 Oct 2021 01:38:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B50768A266 for ; Sun, 31 Oct 2021 01:38:04 +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 1mgwtG-0020uH-0H for ffmpeg-devel@ffmpeg.org; Sun, 31 Oct 2021 00:31:54 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id gwsImPabMSgGFgwsImSEfD; Sun, 31 Oct 2021 00:30:54 +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=f8Q2+96M 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=pXsKi_B63z9SmwAAJC4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 31 Oct 2021 00:30:52 +0200 Message-Id: <20211030223053.32745-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211030223053.32745-1-michael@niedermayer.cc> References: <20211030223053.32745-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfLO5n4TR1sC63y1fVTohlGNhDk8ezKGkYofnkeMBNNJkFgORJP9kQP5nIWFOWedZZ7gjM6N2KG4pJrFLTfW6LihINAkv3aUGFqSTUC5sddhlaxUxeqcj 3opJUnKVcIds+uE2uZlXizkFWe8W4mB4i5RTT0LxPa84viH/sQwJYy4M Subject: [FFmpeg-devel] [PATCH 2/3] avformat/aiffdec: sanity check block_align 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: dWwygF8/LOMa Signed-off-by: Michael Niedermayer --- libavformat/aiffdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 14063474260..648f231a523 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -368,7 +368,7 @@ got_sound: if (!st->codecpar->block_align && st->codecpar->codec_id == AV_CODEC_ID_QCELP) { av_log(s, AV_LOG_WARNING, "qcelp without wave chunk, assuming full rate\n"); st->codecpar->block_align = 35; - } else if (!st->codecpar->block_align) { + } else if (st->codecpar->block_align <= 0) { av_log(s, AV_LOG_ERROR, "could not find COMM tag or invalid block_align value\n"); return -1; } From patchwork Sat Oct 30 22:30:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 31260 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp1066578ioi; Sat, 30 Oct 2021 15:32:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOXinqzdRRD/tQVluY503jaIbjjK7XhBocfq2Y6+4MMpM3rvXrf7+AO8X3my36ts3thsH3 X-Received: by 2002:a05:6402:11ca:: with SMTP id j10mr27789545edw.223.1635633127797; Sat, 30 Oct 2021 15:32:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635633127; cv=none; d=google.com; s=arc-20160816; b=O08b5RE1ZjJoWaDzyjpoBL5ljAegXiuq/entuOeKac46jYvSNJXZMCudDgLJG/7Jbg 7qcUW2kM3wb+Gu8QijlkfgTaaOE+OGT0GDFWRSqoPcm3E7U7+sL8DKF40ZSlvqOi0Tut clYuAgrKv2dV4Yu7vDFeMu1VZT2hFRyBqamWtqP2aPAd0Y7axwazf1C9dvo+BL3c9WsW 7a1GjNCAykpHn7lXr0A2OeTeO8dAy4EVqxbKtSm0AY8GAfDHWRRXMUASjm6f1DYSn6S7 q3hJruHuXJLQCz9hMpnCM/YPeGx9Mvgvbd47DoUPDzhZrZn4xdhM2bmMPLGbrHtlP3Oq IUWQ== 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=uoK41B9ye1Bbp36c4uNo/Jgi4RuoVvYuMCsRmok/ctE=; b=zAnNGoduT4Md0D+WJ/B9MGdprcNfEqmUsLHUvsZa3mXemMH9aXH/m/CaAdyuXukANH qJutt+yqEkkFoRdK+Bn2rKOEhK360+Abq1iNYoQUPEY4KO8UO25vBgLdZG42SWD0u6n8 sZOhcSBhjuf2R0oVPm3v1FqOFy5pNqoJFfL5UQxbMFYwcw70a3CYOjrtoFw7i7Snyac7 GF4HGfsFcJOLpl1IBk7Gj6mXEZn1TS3dL8c43ereh4gc7874ahRhS+evQNvrzNUAdWHd 5ZZcantX3j3S2oOKRJ3LJdZvZF53R9fnPUe6aueCEMYG+PNAtJmAa2qbA2GSLOZ12T3a PKqQ== 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 z22si18037648edm.438.2021.10.30.15.32.06; Sat, 30 Oct 2021 15:32:07 -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 5A44668A2A0; Sun, 31 Oct 2021 01:32:02 +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 E45AF680B71 for ; Sun, 31 Oct 2021 01:31:54 +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 1mgwtG-000s10-0D for ffmpeg-devel@ffmpeg.org; Sun, 31 Oct 2021 00:31:54 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id gwsImPabZSgGFgwsImSEfP; Sun, 31 Oct 2021 00:30:54 +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=f8Q2+96M 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=NEAV23lmAAAA:8 a=xcylD1EIrhqDvAqzGLwA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 31 Oct 2021 00:30:53 +0200 Message-Id: <20211030223053.32745-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211030223053.32745-1-michael@niedermayer.cc> References: <20211030223053.32745-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfLO5n4TR1sC63y1fVTohlGNhDk8ezKGkYofnkeMBNNJkFgORJP9kQP5nIWFOWedZZ7gjM6N2KG4pJrFLTfW6LihINAkv3aUGFqSTUC5sddhlaxUxeqcj 3opJUnKVcIds+uE2uZlXizkFWe8W4mB4i5RTT0LxPa84viH/sQwJYy4M Subject: [FFmpeg-devel] [PATCH 3/3] avformat/aiffdec: Use av_rescale() for bitrate 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: yE0A0Hh8P05c Fixes: integer overflow Fixes: 40313/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-4814761406103552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/aiffdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 648f231a523..7a995c00a66 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -185,8 +185,10 @@ static int get_aiff_header(AVFormatContext *s, int size, par->block_align = (av_get_bits_per_sample(par->codec_id) * par->channels) >> 3; if (aiff->block_duration) { - par->bit_rate = (int64_t)par->sample_rate * (par->block_align << 3) / - aiff->block_duration; + par->bit_rate = av_rescale(par->sample_rate, par->block_align * 8LL, + aiff->block_duration); + if (par->bit_rate < 0) + par->bit_rate = 0; } /* Chunk is over */