From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4E64C40AB3 for ; Thu, 3 Feb 2022 18:46:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9232268B163; Thu, 3 Feb 2022 20:45:39 +0200 (EET) Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37ABC68B0E7 for ; Thu, 3 Feb 2022 20:45:32 +0200 (EET) Received: by mail-qv1-f49.google.com with SMTP id g13so3372225qvw.4 for ; Thu, 03 Feb 2022 10:45:32 -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=Uk57xrwOtUrZgnkBn8hWm17OScITVfByyN9E/exL/s4kocg/frYmxnmQS0kMxog1wJ Vr2zIBSEaPDJqcvdB2EcERlnmLzbbB1lZU0Kf6bnqCaPRliYKJoOArJNmOinkGtg9XU+ Bb/hiXuIoJqi2CRkHtBzXR6ixQLLmhq+m7Mm0JR314HdgTAM/hLH1pYKc/8l4efnRPxP f6TDAEQZp87QffZR4EyYxt0LdAXL4beN4M5lU/uOiHALhv9K+0/guUJn1feEqa37gFJI QfBNJ5dmzdFP4wrqd3/827K14zG8wrDCm9F0joQ737Wtrpjlbm2WN7PYPVq2yRENw0mL YO+w== 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=brMZzNp2rFdXPVHTNThT5JANHSTx70G1jDANq0kxmLs24EmHOqTkozwn4V93oNPl4l fOJFPZw1y4CpAwKe7Lf2C0d8vRfjWtU5Mib8k18uXvXWJmz7WL45YTGAO9hl0+hVS7pR HQ1Opp5+7r/YKSByc1LhcnAVEjA8sE21p8fSnMAb+29Kwj6w6jeIxaMEtxzljO3GX98O +QfJG1U8cRkZ9T/sWEvkjA3St3xtQU6XPYDhqtHlw8j+HaZhY+pC4R0KIXOEqPOCZRqo I78uS3vBzzMDIQ17I5HXXad1ZACKPx2vjLNdcYltNCpiYEvCYNva0jALPQbm2diOrVaS v1mw== X-Gm-Message-State: AOAM530GHzkE8yBdrnA8QR8hkTee4ikfwcJHxlCJCD7llC4zZ4blve1K 1ZQYLeh+ETDOtDOOfGL2j6uik4JOEE9Hpg== X-Google-Smtp-Source: ABdhPJzDDCZz6pgxrfV/YB9V+IiNXms58mPMN8fKpMmgF83CkgyaDMGpuuD4RKYqfPGtGhN53vIorA== X-Received: by 2002:ad4:5ca5:: with SMTP id q5mr31919579qvh.105.1643913930542; Thu, 03 Feb 2022 10:45:30 -0800 (PST) Received: from localhost.localdomain ([151.200.235.219]) by smtp.gmail.com with ESMTPSA id f16sm5947887qtk.8.2022.02.03.10.45.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Feb 2022 10:45:29 -0800 (PST) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Feb 2022 13:44:39 -0500 Message-Id: <20220203184450.5491-3-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220203184450.5491-1-scott.the.elm@gmail.com> References: <20220201212056.29712-1-scott.the.elm@gmail.com> <20220203184450.5491-1-scott.the.elm@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 02/13] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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) -- 2.32.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".