From patchwork Fri Mar 10 13:45:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40643 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1197044pzb; Fri, 10 Mar 2023 05:46:12 -0800 (PST) X-Google-Smtp-Source: AK7set9u2z23MkN2z99ndnpRTXD7PV13l4INL4x9xRIiAmIjHk9ywLQ6Xd7NIOc3d1ANI1HVvf9E X-Received: by 2002:a17:906:7803:b0:8e3:8543:8ebe with SMTP id u3-20020a170906780300b008e385438ebemr26146360ejm.57.1678455972298; Fri, 10 Mar 2023 05:46:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678455972; cv=none; d=google.com; s=arc-20160816; b=ChuUvgCIR4WJhGS34mK5p5hxCmWx2gTWK3Ewi6lVSRSYgENhp4AnsGGWXZECmSfIs7 c8uzXiSF3kLPEHaWJ63gq7fBaomTTNqdLsVyikNFI/IelkeRGhsl4Zzwx9WNzjlZLQzT FUrski3oF/j77pjSChx9fVHG7DRX2SD9pVyoeQIh1UYAvIzDXIWT7w9xRWLTOM3vm7md ZKBEd/RyfTQqhD2pbS9bt6w3+JqSjB1HYgT84jGH+35v44Ye63Kr+KjttAbuROZQa69V 4PZCWxWrpnb9mCKoJ2GaahBF2JsvOYa521/Ew0gkMfN+AirJRDK3cAjqvvNTMStQxmeZ Iy/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=UYcVSAWpoyMofMr/XBmh7aR4UI9aq61YP6BKPQ75b9A=; b=ue7KggqJcU1ef5s6+SAunvVvmFPOdeoTr2hqMqCgoWvefUtQZIfrZFtujxF5lyOc1O K/xlGtPu1V3IIOD6iJXv+rT3hj2XLRFn53emiAIkKrBCvW5G6TN4laOJeWDYBKrKlXw1 GVEK94ejesFzAnHNLkUHmgTf/AuYaTf53UzFMKSqOnCXyz1ej1NS7w2hxa/Wh6676N1T buAZy8bId2bH4keLnmIVKhsfLiJEO0Juq6RiJghdQrSHOcBhI6b5nUzpuqLA68Y4g1iB 5XX4wM1dMJXgo+yFu21uUfkn9Q5Bi2VYOzpjbP3QaxMX+JsXIgx5Mq/93DMKwTzPgvkf HK2A== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h1-20020a170906110100b008d8748f5af8si1903254eja.498.2023.03.10.05.46.02; Fri, 10 Mar 2023 05:46:12 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C18968BD8B; Fri, 10 Mar 2023 15:45:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3259868BC56 for ; Fri, 10 Mar 2023 15:45:51 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 170FA2404EA for ; Fri, 10 Mar 2023 14:45:49 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id L77G3yWxw0KD for ; Fri, 10 Mar 2023 14:45:48 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id A37B3240178 for ; Fri, 10 Mar 2023 14:45:48 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 417093A038E for ; Fri, 10 Mar 2023 14:45:48 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Mar 2023 14:45:47 +0100 Message-Id: <20230310134547.16970-1-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: avoid invalid reads in forced keyframe parsing 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: poo/2q9LLIfg Fixes #10243 --- fftools/ffmpeg_mux_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index b3cc502fdd..09d24ba8e5 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2063,7 +2063,7 @@ static void parse_forced_key_frames(KeyframeForceCtx *kf, const Muxer *mux, if (next) *next++ = 0; - if (!memcmp(p, "chapters", 8)) { + if (strstr(p, "chapters") == p) { AVChapter * const *ch = mux->fc->chapters; unsigned int nb_ch = mux->fc->nb_chapters; int j;