From patchwork Wed Jul 24 14:21:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14056 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 88FB04492D5 for ; Wed, 24 Jul 2019 17:29:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E63F68A16A; Wed, 24 Jul 2019 17:29:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F78168982A for ; Wed, 24 Jul 2019 17:29:40 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id r1so47232545wrl.7 for ; Wed, 24 Jul 2019 07:29:40 -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=LrC7SK2rX7E+iEM1KAKPFVgwM9kVi+AHDjCdKz1dy50=; b=KFjCf4WJCkSZVtd78MlbOKhslNJei+w/XHe1iUkvyGm8wNQDprY/kWCNoY7kUYMWW6 tLu98YQUjxm9CCCqwN/lZxfTXPXSK9RG2DzxGzzq7YsyPJ2+QqocHvS2WrdQKaMmCnEL GosVuERlVp3y8lxuUNq586RgVlG2/7ZuDxTs+RTx/JQy+4ydxYP8HguFzLdLudmzDjaK AUatuzK8L9tPJq6pIJcgz4FPf6QoyELFmn5uUzkAuKSt9+kJoscFUHhKi1P85v/wNAhA A7zAcxlWl/LdjUHP7P4jLdGXFkdhsw8LL2dUbwQE8kRcspyuv+gUFIYTUcYlMrhO3YWE cFFg== 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=LrC7SK2rX7E+iEM1KAKPFVgwM9kVi+AHDjCdKz1dy50=; b=d3KhJM1+h8GFMkMPbbUlZrzdFVVrHb5pFoY0eJvjHNCcz23cX0AzXNpvsEeWplmt1h YcDtyvBC0QSgAyY4upBG3J3MrDGDuj9o4ZiU3mDsnR2+hR8dAi3v+ylY/t45s1UgHO9u rSeNck1l1HWmoAz2C4jFu4yPmjo7+Z0zCB/Ysu0vVCq5VBakXhDH+6Qp0znKvgjTg5wj GMfb7DSpxpcdz0klSSCIdAuuGqVE0UmgWR1hgwcgpN8yqN5Fa34Xp3QOn4xJzUxkgLAt K3Dh+ebvGnbxHMLk181Be49xpV3f85KBXdGsoPPCZzRvjmJq251crO/ePZnvS4+ysXf7 u5vQ== X-Gm-Message-State: APjAAAVcLpsQUaxQ9yskiotZOKEj8JFGoXiJnO9rzfdiwEP1/rR5au8N 6995myKlCM08hfulIPMDxucQvHKR X-Google-Smtp-Source: APXvYqzZeCuH3CLCxmoBdfytGHQ975mpvlvBVok9xovT5qu2zsmITar2ZdIxrf8XLH7XX+iwKZGAtQ== X-Received: by 2002:a5d:5302:: with SMTP id e2mr73465530wrv.347.1563978131662; Wed, 24 Jul 2019 07:22:11 -0700 (PDT) Received: from localhost.localdomain (ipbcc08b8f.dynamic.kabel-deutschland.de. [188.192.139.143]) by smtp.gmail.com with ESMTPSA id x6sm48561494wrt.63.2019.07.24.07.22.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 24 Jul 2019 07:22:10 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jul 2019 16:21:40 +0200 Message-Id: <20190724142140.9601-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190724073133.GT3219@michaelspb> References: <20190724073133.GT3219@michaelspb> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] h264_mp4toannexb: Remove unnecessary check 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" There can be at most 31 SPS and 255 PPS in the mp4/Matroska extradata. Given that each has a size of at most 2^16-1, the length of the output derived from these parameter sets can never overflow an ordinary 32 bit integer. So use a simple uint32_t instead of uint64_t and replace the unnecessary check with an av_assert1. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_mp4toannexb_bsf.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c index fb3f24ea40..bbf124ad04 100644 --- a/libavcodec/h264_mp4toannexb_bsf.c +++ b/libavcodec/h264_mp4toannexb_bsf.c @@ -21,6 +21,7 @@ #include +#include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" @@ -68,7 +69,7 @@ static int h264_extradata_to_annexb(AVBSFContext *ctx, const int padding) { H264BSFContext *s = ctx->priv_data; uint16_t unit_size; - uint64_t total_size = 0; + uint32_t total_size = 0; uint8_t *out = NULL, unit_nb, sps_done = 0, sps_seen = 0, pps_seen = 0; const uint8_t *extradata = ctx->par_in->extradata + 4; @@ -91,12 +92,7 @@ static int h264_extradata_to_annexb(AVBSFContext *ctx, const int padding) unit_size = AV_RB16(extradata); total_size += unit_size + 4; - if (total_size > INT_MAX - padding) { - av_log(ctx, AV_LOG_ERROR, - "Too big extradata size, corrupted stream or invalid MP4/AVCC bitstream\n"); - av_free(out); - return AVERROR(EINVAL); - } + av_assert1(total_size <= INT_MAX - padding); if (extradata + 2 + unit_size > ctx->par_in->extradata + ctx->par_in->extradata_size) { av_log(ctx, AV_LOG_ERROR, "Packet header is not contained in global extradata, " "corrupted stream or invalid MP4/AVCC bitstream\n");