From patchwork Tue Feb 1 21:20:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Theisen X-Patchwork-Id: 34045 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp983072iov; Tue, 1 Feb 2022 13:21:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxtlR/+7I46mR4G8cL5zDfquHgL7YgrbTZGlkDYE576x77OLP0XSoF4G1ECJRov+HhLnbZ3 X-Received: by 2002:a05:6402:11c7:: with SMTP id j7mr27303972edw.124.1643750490297; Tue, 01 Feb 2022 13:21:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643750490; cv=none; d=google.com; s=arc-20160816; b=PedsrOw3Y+TM++bvwczhrZk5pcNOMnCj/J1gN41UQLT7Et0B/MlEpuUnh/IRj+p+ub yNfXaV0o9HR5g2zAbsSSUUQhBUgxaCWP6HUoAlOMC2Di71FFgDZ+Gn9XVMZTiuExjhnj E2uEhaNVr5DkwPNTBe8SeCU9Vb4MViobamYjXRkk8S6YHTyCeXu2BmEd2b3JRDtcxn6Y BX0ZzbmR8ovQh9hauEpbk7HKLLbbBs6lBbLenDE6wuxS5UdwceunjoyEBGCrLeepztAP Hu+a6eo9nxJ/KeCb720Emi6u7f9uJ7WTxiEsa3h/jqWCgzatfFI/FCp/mv784FpY97fK qkTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=gDFxUlqMl/nlgv0K0EZRbzuLDvMBAwlQCpM0vkdZ1Rg=; b=aagvAL6j++4+7zuB6CkT8/TA4Bne7gB8vAw+Dx0DiICgROjC//j9f/zEsB8sUM+REU xpRRTy2ObWWClscYRpqFMoa90vPGs7jWtmY3V4wfQCDnQSqA2dWodhEQcchh+bwcfBUf cLMG/gnZinKfC2OmjGs+w16YR+cIoQH2OkHN3IIM1YMDswdCGkC6eTU24zLdPZXvayV1 BtXYO1tl3DyWGpteA6CHJdToqubVYcDW8mogpNWplvUU6QpyJ2Dq3qsq/CV47KDQSxXT Q/wD8s4TAmwC390kXPtKs8B9SZxI0taWoW15Z55jmpN7Ana9wPh6mPQkpekC9o2gpqY2 oMxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KKmikr37; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w8si2386995ede.635.2022.02.01.13.21.26; Tue, 01 Feb 2022 13:21:30 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KKmikr37; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C34268AFB4; Tue, 1 Feb 2022 23:21:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 860D6689CFC for ; Tue, 1 Feb 2022 23:21:08 +0200 (EET) Received: by mail-qv1-f52.google.com with SMTP id i19so17199361qvx.12 for ; Tue, 01 Feb 2022 13:21:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9dy4aYoVFlHLEy5HO7CVsCAQrO5cMvHaBQi63n/yq/0=; b=KKmikr379ilfHj+xWFiyDFiPX1YLBYmrek2bIPwT81hU3lEX5NXy49YogqZtf0ybnd 1VXZj57eTrV7o9Vo6kJIJEYbRR2QxpSjFf3VEq1DBcvv8AyHISz4iMUy8WgiaKIA8PqJ OoIQlp0wIiDtfYmM/py+JmiOqwAaPBnVoGwjqp5sPIb4YQDNrpFxSz6xaR5cvXTK89Zp 8FupfMhTN3/Mx4VATy+5zdhJ6SM0hRi68XmXw/JGlV+fs/QzoHNGp9WZfX4K6bMNFwu3 WdaO7ITXM4rd16Oj2W1hDwzoMbB2146LEZr6UGis5siBKaFKZepFkAOuUITXVljuzQgy DsgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9dy4aYoVFlHLEy5HO7CVsCAQrO5cMvHaBQi63n/yq/0=; b=fzpmy4UUUIsve/SCVLCDfnIzgcPd8vTNMb1SElINKkiHIk3Kq49Juq9AL6l76s5bWm JpxyUstFmzknpUBwAsHJzSr96fLuNz1B9UCGyWLRku1IRaTc1EQRvFGIAPzznzW9uRpt xuKPseTH8y+y+wv/oyliSfMJ4LXm6v1VFRlm9n38wTlXKJBTKVSf2zc86e/bufBw2XTy 6vseR4aVOZHLB+YYAtIbChQkL1wx6nwZbqyT0CLRwgjXpUkvulhb3cMGxGk+zmx6RoCk B28g8EM5bZbtGPJqIA4+KnRCkKBUL4VSqXd4GfB8vWTQ9muAMph2YSaDqN9ZBeMnRG/M 6PLA== X-Gm-Message-State: AOAM533ygbxD0qN0sW9KMf39WBav+1qdfoLpmIjOQjplBxdvUuOJiIsd g8OQ5VHZhIQivS6BXub+6X7hBbVy59lp4A== X-Received: by 2002:a05:6214:224b:: with SMTP id c11mr23793174qvc.114.1643750466837; Tue, 01 Feb 2022 13:21:06 -0800 (PST) Received: from localhost.localdomain ([151.200.235.219]) by smtp.gmail.com with ESMTPSA id ay18sm2928225qkb.8.2022.02.01.13.21.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 13:21:06 -0800 (PST) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 16:20:49 -0500 Message-Id: <20220201212056.29712-2-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220201212056.29712-1-scott.the.elm@gmail.com> References: <20220201212056.29712-1-scott.the.elm@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/8] avpriv_find_start_code(): readability enhancement part 1 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Scott Theisen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: v05AknBpXX/s No functional change. --- libavcodec/utils.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index b19befef21..cb4437edc2 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -967,10 +967,14 @@ const uint8_t *avpriv_find_start_code(const uint8_t *av_restrict p, } } - p = FFMIN(p, end) - 4; - *state = AV_RB32(p); + if (p > end) + p = end; + // this will cause the last 4 bytes before end to be read, + // i.e. no out of bounds memory access occurs - return p + 4; + *state = AV_RB32(p - 4); // read the previous 4 bytes + + return p; } AVCPBProperties *av_cpb_properties_alloc(size_t *size)