From patchwork Fri Mar 8 09:25:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12251 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 49ED444903F for ; Fri, 8 Mar 2019 11:27:22 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 34A9668A71A; Fri, 8 Mar 2019 11:27:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CB27680806 for ; Fri, 8 Mar 2019 11:27:21 +0200 (EET) Received: by mail-wr1-f50.google.com with SMTP id i12so20564619wrw.0 for ; Fri, 08 Mar 2019 01:27:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uJfFWOV9eDjAecCpWtd1dfJuTfUUj+syF1EPkCdvxWU=; b=GVbCyCnY9ZHNyOCALXK7QhZNubQ7i7hwqpoTG/lzVXCkFM1QElepRmK/CRhu2Es1Jg J+A5fheoXZcIAu6Kew3aIOuYPuqixMFT1n/1JzBi9+TvaaeAaiv5HgsC25qVhCxWGUp5 j+wDmMUi6awcnlFpLqoEEMkWlSmv9gip6OguRmS1qKsA/jeNOwhQ0m+TmDcZA0tE/vcG vkbyJQcFg4mTocm/qjd0ebOKRGSXTTke9nrlR1CK/pelSl60HCZoAXKbYLh9lvRwZl9b YQ/M9DuKoC+gyXUhbzNHMkgqUKNDHLFE2aNV7erpAkJJHWsvNcpwDuRpPERT0RzwB+pO 7EDQ== 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=uJfFWOV9eDjAecCpWtd1dfJuTfUUj+syF1EPkCdvxWU=; b=ZIPu3r1YsZ61S8dD17l2CDhykug+6GDjdnB6QiKPPbHKrCnp/tlicbcblsvwKUQeCF ouO6dErYVyRfAGEzJ+qULHJDO28/Vyaxo4CYfhYtUCNcvu0m3jbueCotzzLigF3Fmy0b 7w7tEARHq+LQsZhv+AdsKSn2vUt2Z9b9DApCG2Gb/X/k7u9N7W4ZTMt/pIsoem6GRprb lb1WsZIzWAFplbXIbtPWSSDvWdPu/ULYw0U/HSQcg7SAeGAlAFua6+8zLsrsjCIbwjHo XXNBxkj/SmBb8c1zjVKdEKPy0D+Y3B5PdQswE9G+E4OQza4lPrq1pROFTIgc4qOB7/pD WDzQ== X-Gm-Message-State: APjAAAUVWdHTW4SileVvY48X3tECvyf+6ATu22+pumJPxWR59xIIPm8/ Hw4/M9C5W6kb8uHCDVk6E0rz1s1VAz4= X-Google-Smtp-Source: APXvYqxnkIyLE++YiwWGVdPLC494/61RdYaWLJxc71p3QNGDQpmPM0P2mBi1CJe0kAdxC242s+rJ9g== X-Received: by 2002:adf:e50e:: with SMTP id j14mr10535743wrm.262.1552037240617; Fri, 08 Mar 2019 01:27:20 -0800 (PST) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id v20sm12179825wmj.2.2019.03.08.01.27.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 01:27:20 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Mar 2019 10:25:58 +0100 Message-Id: <20190308092604.3752-5-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190308092604.3752-1-andreas.rheinhardt@googlemail.com> References: <20190308092604.3752-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/10] 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: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt 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 88e80b2fda..55a153d982 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,