From patchwork Thu Apr 23 03:07:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19185 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6698544BA43 for ; Thu, 23 Apr 2020 06:08:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5353E68BE2B; Thu, 23 Apr 2020 06:08:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AB2B68BDFE for ; Thu, 23 Apr 2020 06:08:13 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id j1so5039333wrt.1 for ; Wed, 22 Apr 2020 20:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gu9TNj0z+yFO4jtBws+B/bRFfjPqdSaEnqU1ec2FUPQ=; b=XxfWlbwx2CIaUEEa+qdBe++48N5b23KQ0gjgXubwP6puT/niV6ZwFUJCL7Kkl8j1Wi 1vSTeZLRDFGB+0LBMfbPox8sFUucxCzVRIGsZfCxpYd8Ucmzr5Q9NnsTnUWgGiL+6mSS kQ3hPRKAuHKO9OrLsemSe4dh5oHZDyrDbRMG56pQaXevmnbgpCEFt1u55JiI9XntCwY3 8GAPKzgIvzYIuSgCZsmmrQE5p4aUCxN06CgteyXvbrYmAgoM1A8+TaSUL9ceFKmcSVDb 3McOPHKSG4DN+0Lszt0IHXJPOnz4nklsVVvU+CTiJBEhGIHmGYoEYcOAGEoYWhT+V+U4 wBZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gu9TNj0z+yFO4jtBws+B/bRFfjPqdSaEnqU1ec2FUPQ=; b=mJRBTBV9HJUiGqifQ1AVN+ytEe1NydXKYGLNgz9ujuaAYH4HeP16qcbbFTEa46+3WC 6VtoFLyWjmaKUCwUS/PU9j0Kh9VLNuUdb4Mr304SviWgB09AHmp4RUclDDXYr9gddKBd esUOEc2WjNaTqy2TMm6xr9FVuAiXF8eokgrwuC49M3uHGfft9f7FdfYHHtimUT9ada+3 7v7KIQrOakYeTUsh8skemereOA9je2TGLGHIDSQQXJ9k4/3SvKUCRbbzFwsiC48Q+1vB TGXtF/8rKH6H5Vu342wcfIBaYCZpVsCh2ZhS5n5i3pRWSMDx83KtkgrhqfZkz1Yu93jF qmzw== X-Gm-Message-State: AGi0PuaxwfwRDKQgDv26c6yVAFRCyI5WApHdl5I/1AYyrmbXX/YXwds5 +O6DgHnNAipOoUgBK8QMi9Kmky9d X-Google-Smtp-Source: APiQypKPI8zZ+ZdqKN3ACNurIStPrhrLYHM+BXxOneagQ5+7N5nH4yYgqSl3bWWeIP1vqKkmgObAzg== X-Received: by 2002:a5d:6302:: with SMTP id i2mr2360208wru.80.1587611292437; Wed, 22 Apr 2020 20:08:12 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id m1sm1497733wro.64.2020.04.22.20.08.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 20:08:11 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Apr 2020 05:07:36 +0200 Message-Id: <20200423030741.12158-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200423030741.12158-1-andreas.rheinhardt@gmail.com> References: <20200423030741.12158-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/11] avformat/matroskadec: Simplify checks for cook and ATRAC3 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Some conditions which don't change and which can therefore be checked in read_header() were instead rechecked upon parsing each block. This has been changed. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 1dc0b77962..5643e15a20 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2624,7 +2624,8 @@ static int matroska_parse_tracks(AVFormatContext *s) return AVERROR_INVALIDDATA; track->audio.sub_packet_size = ff_sipr_subpk_size[flavor]; st->codecpar->bit_rate = sipr_bit_rate[flavor]; - } else if (track->audio.sub_packet_size <= 0) + } else if (track->audio.sub_packet_size <= 0 || + track->audio.frame_size % track->audio.sub_packet_size) return AVERROR_INVALIDDATA; st->codecpar->block_align = track->audio.sub_packet_size; extradata_offset = 78; @@ -3138,7 +3139,7 @@ static int matroska_parse_rm_audio(MatroskaDemuxContext *matroska, } memcpy(track->audio.buf + y * w, data, w); } else { - if (size < sps * w / sps || h<=0 || w%sps) { + if (size < w) { av_log(matroska->ctx, AV_LOG_ERROR, "Corrupt generic RM-style audio packet size\n"); return AVERROR_INVALIDDATA;