From patchwork Tue Dec 3 21:33:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 16575 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 DE4B644A97B for ; Tue, 3 Dec 2019 23:41:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD77B68B0E0; Tue, 3 Dec 2019 23:41:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f65.google.com (mail-ot1-f65.google.com [209.85.210.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9BB5D68A8FA for ; Tue, 3 Dec 2019 23:41:06 +0200 (EET) Received: by mail-ot1-f65.google.com with SMTP id 77so4374672oty.6 for ; Tue, 03 Dec 2019 13:41:06 -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=yAFgYk9lFzeJjOCXWgV2dGR7i3SuNEz5Htswks+2bu0=; b=ZjMDtilrFTUe5/8DbhAeNVNZBHESjc26FKZuu3gRjuT96be948+EzY6biDMwx6Wk2U oNSLLxQriOuTt+tNiE4M0aDymVffZBVaKz/yoLVBZklBO5KR//MOWk1+rlWmNGyffkee CDjl3ocD/JXLb6noWdrzprhUX5Tdq6SekTRwA00GfYNyiBLhpahbtE6jomM8gn6lt3ej jKXT9DexXttScN+EGOSzUQnFtM8/1tKmoRh7XJAURVCMgNCRtj2EbUlAny0lDinudpbl uRAeBH9XQmJs9P7ndwjsCu2VJ+zcFdH8O6sjabVZJ9dx3tBT597zV+XbyXMRFbLRcv04 Blyw== 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=yAFgYk9lFzeJjOCXWgV2dGR7i3SuNEz5Htswks+2bu0=; b=SNw2tPUaaamCmo6Zjou2k/Xt8uylP/HcX3aA3d36DckKnucUMhkVAooA8F2du6mMw8 uI+WKLkJOc5HvrgzRmPOdhBWvGIzy3ffYz8VOoKpclFE6PX+3zCBOaj2z9mlmUr0JJu+ rrOOQZ50CEsS9tAjMUz7A/rAIbKjfQRvrD94iDqUsjU9HuJw44Qt/UdNuJUMiw45uYbo /sAVRVxJ/MNNVqPRmfAr7xrJyzb9PSXytJrf3I0pGKtvhKDLi2OnwKrZUkVM/PLOuWT9 x5M0Tfi7XoXF/h58gmRUytxX6MQafUmSgENPIRJrzYjCGQKyWIwj6edsj1Ri40/0zXx2 AI4g== X-Gm-Message-State: APjAAAWibBQ5QnW3kpcUbFerEnLwZS0FFmqxyof3E9MWRM9kNlTF2liz MdotYbOLSy70ICJZ9mAjpECvwDip X-Google-Smtp-Source: APXvYqwTvPMJ5/XKQvad6TXZh9iJi99SJFksDUo+T+TUAEQQ6V4lUlfrra2P2srRh/lQPurBQzU1Pw== X-Received: by 2002:a9d:6a4c:: with SMTP id h12mr5070292otn.81.1575408850461; Tue, 03 Dec 2019 13:34:10 -0800 (PST) Received: from manj.guest.slb.com ([192.23.22.48]) by smtp.gmail.com with ESMTPSA id q5sm1580988oia.21.2019.12.03.13.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 13:34:10 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Dec 2019 16:33:56 -0500 Message-Id: <20191203213356.17842-2-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203213356.17842-1-andriy.gelman@gmail.com> References: <20191203213356.17842-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] 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 36fd6f0b15c..49daf4a616c 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 + nalu_size || - INT_MAX - 4 < extra_size + nalu_size) { + if (INT_MAX < 4 + nalu_size + extra_size) { ret = AVERROR_INVALIDDATA; goto fail; }