From patchwork Wed Dec 4 00:04:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 16578 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 5E0C644AF0A for ; Wed, 4 Dec 2019 02:04:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4209F68B479; Wed, 4 Dec 2019 02:04:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f67.google.com (mail-ot1-f67.google.com [209.85.210.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59E3868B1AF for ; Wed, 4 Dec 2019 02:04:20 +0200 (EET) Received: by mail-ot1-f67.google.com with SMTP id i15so4701141oto.7 for ; Tue, 03 Dec 2019 16:04:20 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=+JQJ+hzhBZjJYCICoKEd7Gq1KzP/YCAxPhH/fQiNXGs=; b=dHDBo8BTlS75lEO/Z1dtrlVblM38T2K2rwekapCurRkcpaYwn2BUlFzIQvqgbldFyI vA7UtgYCvTwUyrW2OuFUMe031HdBfuYBtX4R6JFAaH/0PdWVzgilpo7Rbopw9ktezQXy eiRNp09HZvrvx8SzEHkTRzIpCShBYEllLB4k72dVtjambTcq+zhmWVDLDEt8Yjw96Fg8 vghvhVv60iO17c8GzKGmDHjGhqdmSkbwOvqOOTXeBXvJA4DROpSGrRsbDeAX0n0W/mGD 4rrPPBwpV6qyg3FwlOzrnppqiiRJuBxu2xHvz+7YvEK0Ce4oO3/EnKebhew4troncUS2 hMTQ== 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=+JQJ+hzhBZjJYCICoKEd7Gq1KzP/YCAxPhH/fQiNXGs=; b=G1Pd0pgB1OawwIOmESOkELILXdjDysF2k7CtaMUPfZ7YxF3nWviQk77GHWQPGPYvZt 95vWmGFkxAd3XawhKhGR64ScU8vd0/wls7FX9J2XHu/phVoALxfBVhCAonjnmQeG/hxF ZDpQJPt8umdO6LNttPWzT/JJzl8uP7x2pqXbpnHhvDxNjzFw2AfzJwm8D8wUMBbsrIit uWAEgBywZQ6TzauAhjS36Mejw5rJ7Pqi4cYfdZII0IP7hZsgnITvT020BVLpiM+UGv0N UGDjObiIKLf5WwOsJ6/quvqdgHW0b/m8S5F3FHX40W6GwFXkKrhLfbYKvV9XR0wgcQml AM6A== X-Gm-Message-State: APjAAAWdV0h0eu5cyD08hPLTLa0Acy3yrkN7+EImlyV9zEAd95qLtNSQ 5W+ujFGtiFrOhjVSu2emzHt59cSF X-Google-Smtp-Source: APXvYqzg1AEY9e+j9wBAu3lDZ1FvPWw1PPXT41Jm+W31C08ITiyg5pZGAPV3cBVshjm7YHCUlHBgtw== X-Received: by 2002:a9d:7201:: with SMTP id u1mr461717otj.181.1575417858710; Tue, 03 Dec 2019 16:04:18 -0800 (PST) Received: from manj.guest.slb.com ([192.23.22.48]) by smtp.gmail.com with ESMTPSA id t3sm1611013otq.32.2019.12.03.16.04.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 16:04:18 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Dec 2019 19:04:10 -0500 Message-Id: <20191204000411.29765-2-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204000411.29765-1-andriy.gelman@gmail.com> References: <20191204000411.29765-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/3] lavc/hevc_mp4toannexb: Simplify error 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman Signed-off-by: Andriy Gelman --- libavcodec/hevc_mp4toannexb_bsf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/hevc_mp4toannexb_bsf.c b/libavcodec/hevc_mp4toannexb_bsf.c index bf4c25b3b7b..faf516634b2 100644 --- a/libavcodec/hevc_mp4toannexb_bsf.c +++ b/libavcodec/hevc_mp4toannexb_bsf.c @@ -152,8 +152,7 @@ static int hevc_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *out) extra_size = add_extradata * ctx->par_out->extradata_size; got_irap |= is_irap; - if (INT_MAX < 4 + (uint64_t)nalu_size || - INT_MAX - 4 < extra_size + (uint64_t)nalu_size) { + if (INT_MAX < 4 + (uint64_t)nalu_size + extra_size) { ret = AVERROR_INVALIDDATA; goto fail; }