From patchwork Sat Dec 14 22:19:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16792 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 18A93449496 for ; Sun, 15 Dec 2019 00:27:22 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 05082689824; Sun, 15 Dec 2019 00:27:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B6CFD6881F1 for ; Sun, 15 Dec 2019 00:27:15 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id f4so2076440wmj.1 for ; Sat, 14 Dec 2019 14:27:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DzrM3+gvpNDUyr6jFpjX2PR1NbicdKbNPM+L3GQGdEw=; b=CU9CgtJXT2xEem0HyVA1cXaImLePLjXJFiVnLfsQYNRsLLoUchqeby7GLtQK/5jm5S c1jaKkKisUvwW0Dm/sZdBqPhVDCdObxpftliM2wJYmN+4XxWkwuM44iWLdJWPpRA1Qoh bjxEAj46ynxFGs6AwNiKPUHXFhi/yINzoLs3K7tkrz46Y8Ix7ifOZ8/F+EQVBfB3X5pI YbjDJlDNa/gGiUGy6kDL19B2si9hY2v5QwIw7HgeQWDsC2vOs/K7AnUePNZ7417guqZG xL9QLpXgpTaBr3p6P1V745/E+SoSQ6ZucW0RA5hXJ4U2W/kW5VeqDcHufiZw6W5qnJOa tf+Q== 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:mime-version :content-transfer-encoding; bh=DzrM3+gvpNDUyr6jFpjX2PR1NbicdKbNPM+L3GQGdEw=; b=J8pwpEaQjLdIXBf4zJe4zmv79YRrSuiz/FvkaBSPa+ReQOepaCWVXSrx8g7L1a8x+J kJiaYjL0bSehi0QsIcGdioBmMvm90L32wXwA0poj5+N/RwL0qgnbvwCehzmbIiGKtX2L qs/okXh7i2sw5CpxlEflBLKiRxcLv7bVBXMXsximZF1haidAXgxVCIIKiHZVoD1BAuJu PWD+aP65phn+7pQh5b401fP+PNanek60nwrT26teW6xbwzubKDS6oBX3qXjqFnf6uUbe Q31YavbkGE56h/d2BlIqxslUoXzb/9uw2mvXm26vq35MdeP4gGLX9/Sw7nbfdblw6llH i6Iw== X-Gm-Message-State: APjAAAXg2Od/w3/zJQeYyhOqnB0u/KM+aLnBBo5lhw1aSbZA0llDWL8h hq6diYxrQEfYl4hwSikN2YdN6aPl X-Google-Smtp-Source: APXvYqyB3jhyTI7SQrk9EJVplYF0wDBfYuzRf7Dqs0QEwqNrmHRAHJri2MwD52g3CcCTD5BIS4BSEA== X-Received: by 2002:a05:600c:1:: with SMTP id g1mr20614947wmc.131.1576361973680; Sat, 14 Dec 2019 14:19:33 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id v3sm15063771wml.47.2019.12.14.14.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Dec 2019 14:19:33 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Dec 2019 23:19:13 +0100 Message-Id: <20191214221926.16074-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 01/14] 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");