From patchwork Wed Mar 27 11:18:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Felix de Souza via ffmpeg-devel X-Patchwork-Id: 12471 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 B398D448C86 for ; Wed, 27 Mar 2019 13:20:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 999FE68A931; Wed, 27 Mar 2019 13:20:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55BD468A92E for ; Wed, 27 Mar 2019 13:20:38 +0200 (EET) Received: by mail-wm1-f50.google.com with SMTP id t124so16264023wma.4 for ; Wed, 27 Mar 2019 04:20:38 -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=W+C617fSF3x5gi9n+HrmvoXtV3Td7JB+JldYSgYhyjY=; b=W2bsdUKNF64vDTYh5ISIwOEoGnyXKC2HTCZsmxnD7m/4hVgHD0IciTQvyW4o13/OKB 0gO5LW9sT39jUALIEWr2aCVR5T7InzuzDrXC4L5IVNepCup1wa6KbIlXAs2lTs/Obu+J vyyWrED7nsxJmhSRTOnPw5TKwurFPwav6ZeM6cPzDK5ZVusOfw5RocNg5o2aUkRDXB+Y L/vCPrVYaIHOkZ0Svs0i0KurqZTZ1hMwOnfF2D8kS/nSwG4jpI9ms0+HAUbWHJYrYHlk KbZvi/sILb45Dnahq6pIGzJSL+++QQBs2wOgmwAPShgvhOIFEBqyTeWAgBrMahngkuZa 2y5w== X-Gm-Message-State: APjAAAWDigFEiwU/jyzg+cmG2Gq2SmSy99aKek7Adl/nLucTwL1LYGmM X4/ks3dDzz1GXCX74mXHmlJIkEDXF2A= X-Google-Smtp-Source: APXvYqzavEr7HSY1cwBMT3dTes0jHE6UL6rhRVkF4RcDM74xnPpCvm6gyY9Z8xrwkl/FnlkNOCfKmw== X-Received: by 2002:a1c:eb14:: with SMTP id j20mr12806850wmh.32.1553685637710; Wed, 27 Mar 2019 04:20:37 -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.20.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 04:20:37 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2019 12:18:35 +0100 Message-Id: <20190327111852.3784-5-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 04/21] avformat/matroskadec: Use generic size check for signed integers 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: Diego Felix de Souza 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" and drop the redundant checks contained in ebml_read_uint and ebml_read_sint. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index f3bc792728..49f8ff4082 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -882,9 +882,6 @@ static int ebml_read_uint(AVIOContext *pb, int size, uint64_t *num) { int n = 0; - if (size > 8) - return AVERROR_INVALIDDATA; - /* big-endian ordering; build up number */ *num = 0; while (n++ < size) @@ -901,9 +898,6 @@ static int ebml_read_sint(AVIOContext *pb, int size, int64_t *num) { int n = 1; - if (size > 8) - return AVERROR_INVALIDDATA; - if (size == 0) { *num = 0; } else { @@ -1161,6 +1155,7 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska, { static const uint64_t max_lengths[EBML_TYPE_COUNT] = { [EBML_UINT] = 8, + [EBML_SINT] = 8, [EBML_FLOAT] = 8, // max. 16 MB for strings [EBML_STR] = 0x1000000,