From patchwork Wed May 11 14:48:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 35732 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3934080pzb; Wed, 11 May 2022 07:49:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxo+MLOhQGN+qg35SDv8NUWxdJKEmlMlcShoythYkvic0kWUjdui1zsW7qdLu5uYBVQ8tQr X-Received: by 2002:a17:906:dc93:b0:6f4:6a93:f227 with SMTP id cs19-20020a170906dc9300b006f46a93f227mr25015040ejc.661.1652280581804; Wed, 11 May 2022 07:49:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652280581; cv=none; d=google.com; s=arc-20160816; b=uwsiaKdaQkzXSRVii5NyyVVWIbV+oWsEU9t2mzAhL8gpPZxxlGCbzmMGVUK4zrDdoA n5+aCuE3kQ5rLLMCD/VzV4frt0Z8BWbL9ob8NNQ1HKunyRnbZ1jWfeinslMUosvWTg5g hgoOpyuDuOqeU82WNhYPnSH9y/CQwCZVjvylXVtdmbv5ND9Stv8iCcjdpQsXWRtaPMR5 EReyU0N3vWiEswg5u6N84CF6Oua220erJMfCXfVC5ojLYnAdhWideLpbuC/ctpCZapLJ 40apdFKMM55W6eeplGiWz80VAy2WmTQcAN6MXz4rIv+VWdQBNIYxgx5lnkAlg0QJJOF9 0iRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=CElQbFmg4knx+X2+uIyzLtmLumsEeauOjq6bsbeGabc=; b=sPMycwOr2Z4kSKJE3J3tSxT1/XyjhfP6TGXxNSyMkkT82Kz7IrzqRHNj9m2h9lX3xa Kx6h6kzcbgfGVbqnHob/Kl4vZJ0lh15aAEipgECDMTvb1ULnexu0fF6qg5M+IMHQTZVu nLAiM5/3lkGrx9OwuJse+P0J9OLpNA+sxqpWHrULrtvK6JqMFrbh3rsRg5FMCx1SC43C AzdRSaMq1292SHwfnoYaUlf2U2MQl+1+enrVkDDPi6oJKmJwenvUIfNooMt6B5KxM4P3 cAI5vn9+YPWGaTR7DqpVCoCwyV+MHLr7hZMlPtrIREqq/QCnHqwRcXY9eKq3w//li5xf iQbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=OH36ihhT; 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 dn15-20020a17090794cf00b006f4664eeba5si2846867ejc.390.2022.05.11.07.49.15; Wed, 11 May 2022 07:49:41 -0700 (PDT) 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=OH36ihhT; 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 840B468B445; Wed, 11 May 2022 17:48:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E70B68B411 for ; Wed, 11 May 2022 17:48:28 +0300 (EEST) Received: by mail-pj1-f52.google.com with SMTP id x88so2470977pjj.1 for ; Wed, 11 May 2022 07:48:28 -0700 (PDT) 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; bh=2Cmj3OGzpcM5MapK/L2PH2LdlSyxaLEZQzf4UF9XhwU=; b=OH36ihhTqHJZS+6mxjfsfl2cYj8LFELVVrIuEMrXTV7/v/+LVBC5xW9WRWEnizwPxP S3fZXIx+CU7PiID38uS4YOPs7pf8SLv1alzXfnD4quJWBqie1whz7ZnJX8OGSIRGo8hl X51JGEehkWuawgFjGBkyWjAE1nHfTxHXnWCxanvEr7xcKobCy4CAQSdkGoIwwCkbhsy3 NnHxu1jbUEf3J8MCYcW8RJYgqxSYEqtNZPZlC8IYG/eTYGk4I/wXW6VuQIYp4zavQODj anv5Jj3XNfU8PkpWzNECWtV4IlhSxMFfBMMXE2qyibLHwSNWxB0W2fYs4XpAayvwwd13 sX6g== 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; bh=2Cmj3OGzpcM5MapK/L2PH2LdlSyxaLEZQzf4UF9XhwU=; b=lB0X1dkD9QaPVDmEnF1JRRi3Ebx1dL+JbPjGMdZq5pgJKReBn+xBrmisKVra3GD1EG mARcDyGvgYBm5YMoi2vPnHFJQDgqBzqnYBXIkA2db1ul56B8IaCbFZUsh2De8d4vY7Og QTBK8q4iiwtLrilV55G1icQbGA1GF+3DTDQaPD+NzRNO/CA63vEkyk3oChA9btTBmLNs gUUNu2Q4/sLIlSI5wm8d9SV3M4vreHc87SXsEyHRCAft13Yv8NValyUdVJaJGAqnX3bJ /XYeNN21BIQBSboLpJXIfVdprAVpybp/lsR1Vsc45wBkpUpZ+TmrZeXX+/6veVFPSwBc O6Nw== X-Gm-Message-State: AOAM532WSaCP4Zocc6KbBFoZy1eMg07by6Wa26c3CPt/oIhILymew3bt LcA/AWuTz1dZq0xz7HmCp5S3fz67l9U= X-Received: by 2002:a17:902:b213:b0:158:d44d:cad4 with SMTP id t19-20020a170902b21300b00158d44dcad4mr25764649plr.45.1652280506641; Wed, 11 May 2022 07:48:26 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n17-20020a170903111100b0015e8d4eb2c6sm2059020plh.272.2022.05.11.07.48.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 May 2022 07:48:26 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 May 2022 22:48:17 +0800 Message-Id: <1652280498-10408-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1652280498-10408-1-git-send-email-lance.lmwang@gmail.com> References: <1652280498-10408-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] avformat/sccenc: avoid potential invalid access 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DVXrJAIDwNTH From: Limin Wang Signed-off-by: Limin Wang --- libavformat/sccenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/sccenc.c b/libavformat/sccenc.c index c8c4d097e4..2b924ba6e7 100644 --- a/libavformat/sccenc.c +++ b/libavformat/sccenc.c @@ -72,11 +72,11 @@ static int scc_write_packet(AVFormatContext *avf, AVPacket *pkt) s = (int)(pts / 1000) % 60; f = (int)(pts % 1000) / 33; - for (i = 0; i < pkt->size; i+=3) { + for (i = 0; i < pkt->size - 2; i+=3) { if (pkt->data[i] == 0xfc && ((pkt->data[i + 1] != 0x80 || pkt->data[i + 2] != 0x80))) break; } - if (i >= pkt->size) + if (i >= pkt->size - 2) return 0; if (!scc->inside && (scc->prev_h != h || scc->prev_m != m || scc->prev_s != s || scc->prev_f != f)) {