From patchwork Sun Feb 27 13:50:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34537 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1881602nkx; Sun, 27 Feb 2022 05:51:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyvVQLgx9G99hLNAXnP9IZXmRoTryV31lWNX4tNYWd/2pt9X88UhcqTD+uy0DAA3fUAamYn X-Received: by 2002:a17:906:8244:b0:6ce:7070:b485 with SMTP id f4-20020a170906824400b006ce7070b485mr12255073ejx.347.1645969887547; Sun, 27 Feb 2022 05:51:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645969887; cv=none; d=google.com; s=arc-20160816; b=fwkdSQEQPhz4PQxDtMeQvDc7z32hKL4luZmqcDPT8rbawmQbpfnDrgNMkisFKviI+R D4QjWL8wnoqE5NmSjXvVAQiDhpwMezvOXGUL1jZfeha2LbG36DnZ/zGaFXKO5exmWWRx gS/8B8KkLrMiLhK/eI1NNsOdRA4ORb0LgQAIzY7plk7HZLVxNHE/a/i9PAnRGVu1Q6KL Pb7zQhJ+wcsYxsiKq4NhGURYi4IrnNTLUA8gCvOXTx7jbyBopZfe8W3TwtXxV9BtwAND XgyGlKVQZyJ57JkvwWWZMTu5Uj5BHENckoljyodZHDPjM/h93kILqer1ihfwaaE2JZv/ 6Ezw== 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=oBQDmn87FmxYxzWQkpuMCRETb40EI3mExKseg8L6Aew=; b=ImmCJxbgWSkf7nTIUNiQq0h1jyBwRMS8PsZrHACdiywg/u1ank58uHW0vethKrfT60 4wKdctfnbP2a33qoumQHmjdeiC21P3DfogW82whcSWhZFfN8g5OXaGxBXnIaoS4h18Vg 44HfQ8QuJVu4r63xx5AvJBtYHNUgk2ABwnnm/RER4qoDHLRxOWFwajUm191pIL5qXSrA NMi7xfsRvcUFoLtbzl6wFQms27dxpmqTz4bfe3oKfs724i73IvnEbUxTj+4p6z7+7HV6 xx+LCDuLMScpim/izFIoiXyZEYxnYBba0LnAKEJ5swE8eF9Pmtv/wXGXnRW0mw4e43CO ZJyA== 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 p16-20020a1709066a9000b006cfd280111bsi4257047ejr.844.2022.02.27.05.51.26; Sun, 27 Feb 2022 05:51:27 -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; 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 0EB1D68B02B; Sun, 27 Feb 2022 15:51:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (unknown [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A02A68B02B for ; Sun, 27 Feb 2022 15:51:16 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nOJxD-0005SP-9z for ffmpeg-devel@ffmpeg.org; Sun, 27 Feb 2022 14:51:15 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id OJuxnbxSuSgGFOJxDn4mnc; Sun, 27 Feb 2022 14:51:15 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id OJwxnFduAfYHNOJwxnyKQ1; Sun, 27 Feb 2022 14:51:00 +0100 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=MrIxV0We c=1 sm=1 tr=0 ts=621b81d2 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=vO88mqYgGFGCAsMosPYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 27 Feb 2022 14:50:58 +0100 Message-Id: <20220227135058.15739-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfC3Kgq2K+MeOdiZyNKQGRguC3UYgIqarGYhDZ+rhytGPKmWVPHjKmYqUqJFeKepm821FabCpd0XWaVQaQfsK0wctPZdsxM4lU6b/8ku5Bzt6OkEqJ/XT lN2Nu+EML0JD3+V9/NQ6b+oxATmzxTaZohWz0ZHV6GlNA4CvjPHtsgvhgskqwNvdvfuqHgyrHAuR2Q== Subject: [FFmpeg-devel] [PATCH] avcodec/g729_parser: Check channels 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: 4FZD09IQyIDb Fixes: signed integer overflow: 10 * 808464428 cannot be represented in type 'int' Fixes: assertion failure Fixes: ticket9651 Signed-off-by: Michael Niedermayer --- libavcodec/g729_parser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/g729_parser.c b/libavcodec/g729_parser.c index 8c06ce4ee6..4dcdeab651 100644 --- a/libavcodec/g729_parser.c +++ b/libavcodec/g729_parser.c @@ -48,6 +48,9 @@ static int g729_parse(AVCodecParserContext *s1, AVCodecContext *avctx, s->block_size = (avctx->bit_rate < 8000) ? G729D_6K4_BLOCK_SIZE : G729_8K_BLOCK_SIZE; if (avctx->codec_id == AV_CODEC_ID_ACELP_KELVIN) s->block_size++; + // channels > 2 is invalid, we pass the packet on unchanged + if (avctx->channels > 2) + s->block_size = 0; s->block_size *= avctx->channels; s->duration = avctx->frame_size; }