From patchwork Wed Mar 27 11:18:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhupengfei via ffmpeg-devel X-Patchwork-Id: 12490 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 9FDAA448F1B for ; Wed, 27 Mar 2019 13:23:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 86DFB68A974; Wed, 27 Mar 2019 13:23:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15B4768A92D for ; Wed, 27 Mar 2019 13:23:01 +0200 (EET) Received: by mail-wm1-f44.google.com with SMTP id t124so16272810wma.4 for ; Wed, 27 Mar 2019 04:23:01 -0700 (PDT) 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=3xo0TaVDSKlXQVv6JNXOMdAH9ZmixOBNZ9XbYDmXCiE=; b=LQNaOIZ4TaER0T9L/g3Ycuyt4gPOoNkAqEfWpJcYEo4Ahxt+hE5Ux1dfMRIXsTKoWS FVEUVnz51yofGlmdTdn8q346P+FocFRVN5FEy1NL3miVdtU2di91hQdsX5o4nUtEECHK p/7+1B9ppaFpc6LlwExWFXeETWt+fdEEWoqadrrKVq7/53Su0mJgZJAb7kYk9EADm6jF w5Hkx8OMMwP2UZkZAmu+ko4OvTBQzumXYvaIp/IBJ2tUYicIiaXZs3qOQavxAp6seFmN 3OZZr+wmbfywYj/pgcDnLRkJnu3fuMCFsIH9l3THuaK6SNQfcHYd6LxjuHwVuHF9oiVo W7Fw== X-Gm-Message-State: APjAAAUN93+RMEhoJnda2rGz9CNHfBlAs8zX+SRymhgdjaSFuyqTRtdW /zCaTJSYAJAugOZxAw79XN9TqFIYcNo= X-Google-Smtp-Source: APXvYqzCHfza+PQyaYeH2SouEelWLKEqm+2Fnv2cCT7n/T5Bnaw2HALVV1OqPKAnbfzejfpNPX/vhA== X-Received: by 2002:a1c:5f08:: with SMTP id t8mr11508319wmb.65.1553685781227; Wed, 27 Mar 2019 04:23:01 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id h10sm31745448wrs.27.2019.03.27.04.23.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 04:23:00 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2019 12:18:51 +0100 Message-Id: <20190327111852.3784-21-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190327111852.3784-1-andreas.rheinhardt@googlemail.com> References: <20190308092604.3752-1-andreas.rheinhardt@googlemail.com> <20190327111852.3784-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/21] avformat/matroskadec: Redo EOF handling 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: , X-Patchwork-Original-From: Andreas Rheinhardt via ffmpeg-devel From: zhupengfei via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt , robux4@ycbcr.xyz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This commit adds a check and a corresponding warning whether there is data beyond the Matroska segment (only reasonable for finite-sized segments). If everything looks alright, then parsing is stopped as soon as EOF is reached (in contrast, the current code would always call matroska_resync at the end). Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index c1feb3f0a1..bd0dfee4db 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3547,6 +3547,14 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) ebml_free(matroska_blockgroup, block); memset(block, 0, sizeof(*block)); } else if (!matroska->num_levels) { + if (!avio_feof(matroska->ctx->pb)) { + avio_r8(matroska->ctx->pb); + if (!avio_feof(matroska->ctx->pb)) { + av_log(matroska->ctx, AV_LOG_WARNING, "File extends beyond " + "end of segment.\n"); + return AVERROR_INVALIDDATA; + } + } matroska->done = 1; return AVERROR_EOF; } @@ -3560,10 +3568,11 @@ static int matroska_read_packet(AVFormatContext *s, AVPacket *pkt) int ret = 0; while (matroska_deliver_packet(matroska, pkt)) { - int64_t pos = avio_tell(matroska->ctx->pb); + int64_t pos; if (matroska->done) return (ret < 0) ? ret : AVERROR_EOF; - if (matroska_parse_cluster(matroska) < 0) + pos = avio_tell(matroska->ctx->pb); + if ((matroska_parse_cluster(matroska) < 0) && !matroska->done) ret = matroska_resync(matroska, pos); }