From patchwork Wed Aug 11 14:54:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?St=C3=A9phane_Cerveau?= X-Patchwork-Id: 29423 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:8e8b:0:0:0:0:0 with SMTP id q133csp1472114iod; Wed, 11 Aug 2021 07:54:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUWhQ5t2nGXOyxjQSonxa4GMokmw6gJIoiDOMNgDQkhAn4VDRTo3yTGYuPlQ6qYTtL+jWe X-Received: by 2002:a17:906:e291:: with SMTP id gg17mr4087473ejb.477.1628693678624; Wed, 11 Aug 2021 07:54:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628693678; cv=none; d=google.com; s=arc-20160816; b=tB30ZBXet9/1VKoUbps1b8mdhyXOfMD6sFmINLb/pIb9mIkjrwic3xdIHvZRoRxXvP zuXl7+P8LYk7XI51i+sMMb9za4YT1p60t+pguXXFf9IW9LHdFY1swPo02r9bZtYxkERT 4iTm73RZdsdVH+wPtlncaVsCemgIAgfDoj0GGU08LmEs0SOLI4oIRvFC2E2JNzbK8sMM S6jphQwrpv47Qkae1SvAELJrugwCnbuFZ0em7WpZC/z5joOgNjs7TjKvgQbssu+C/3yi E2FnBEqXqP8MqD7ssV+4FYhbhdJNAmgnRvFBp06gZ7QnS27BuvQ1URzZjFGVvf/t6C+m fXjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=xgtHi3Bu2M+WXtV/5mJxZrHHTLul4uJVD3CL6lcS0SI=; b=ddR8kD1zyoEzmYC/gvfu8kUFoyJzPkTbSc+FKS6NKcNk0uDmDGV4RMBXR+rxC7ba/F 92g2u5esPI6IZTvcZfM48DhxhhH/63OAuGUnmO6duKjlTnRzswH3+S2vExs4g/BoBldb vVA+7nprZflY2T/zhr5KZLMTXIUmVtYTOOSP0EXMqbwhRUMNAnWgtZ07z1bP6MtR+nv6 HKXptxk+BdjvUdBIGKQtpu4QPTYPDjU/xoXCPzyJKuASdvdJp+rsdYOUU3bOkzhRR9Xp mTIIDV7//dCZU+9HFJ37zCJrp5n8wFwtiWaRHLkl0OE133K2jE7cjIF1mH6t5fVwW+Vf fYig== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ch5si1729806ejb.547.2021.08.11.07.54.37; Wed, 11 Aug 2021 07:54:38 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4A1F688051; Wed, 11 Aug 2021 17:54:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41C56688051 for ; Wed, 11 Aug 2021 17:54:27 +0300 (EEST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: scerveau) with ESMTPSA id 4E7021F42471 From: =?utf-8?q?St=C3=A9phane_Cerveau?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Aug 2021 16:54:12 +0200 Message-Id: <20210811145412.271251-1-scerveau@collabora.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/wma: handle run_level_decode error 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 Cc: =?utf-8?q?St=C3=A9phane_Cerveau?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Lic5V8ln+436 Consider data as invalid if ff_wma_run_level_decode gets out with an error. It avoids an unpleasant sound distorsion. See http://trac.ffmpeg.org/ticket/9358 --- libavcodec/wmadec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index d627bbe50e..74ea8cea77 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -606,10 +606,11 @@ static int wma_decode_block(WMACodecContext *s) * there is potentially less energy there */ tindex = (ch == 1 && s->ms_stereo); memset(ptr, 0, s->block_len * sizeof(WMACoef)); - ff_wma_run_level_decode(s->avctx, &s->gb, &s->coef_vlc[tindex], + if (ff_wma_run_level_decode(s->avctx, &s->gb, &s->coef_vlc[tindex], s->level_table[tindex], s->run_table[tindex], 0, ptr, 0, nb_coefs[ch], - s->block_len, s->frame_len_bits, coef_nb_bits); + s->block_len, s->frame_len_bits, coef_nb_bits)) + return AVERROR_INVALIDDATA; } if (s->version == 1 && s->avctx->channels >= 2) align_get_bits(&s->gb);