From patchwork Fri Dec 10 10:20:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Monroe X-Patchwork-Id: 32256 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1595002iog; Fri, 10 Dec 2021 02:41:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJyL0HNyKiLiet2Goo67YZRHSpzIPcKcayb+5UYmjXTyF7TeVJdHtcOwMne7nvE/xfGjqDah X-Received: by 2002:a17:906:9756:: with SMTP id o22mr24030110ejy.324.1639132882679; Fri, 10 Dec 2021 02:41:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639132882; cv=none; d=google.com; s=arc-20160816; b=Au0I6n+0D+Ug/CA1tNnF01ydPkVM+0m3uxUg7S4th7Lr6H81xlQkDUF3+BckCXXeGB CoIU2KAvMc/PmM4AO8D0JmIicRw3vTzYLI7QLDUfooNQ9XM4UwoUlrDp184GXta6cRsJ 46qrPYxbITBCUamLx4GFrBpV/dT7u58X3Nh81zejIZBr3WxMQ0Yz1srZyt+Im7Akd2eB nWsVXPPahcKmK4tl6XG30AgmdbVZN7tzBFb+jW/aZpMRHQKO/H23/CNF04E3Qhy3H8vA 5lZZ+plhnX2D/N2EOq8WcU8R3tmWfJURZTSkkIJSl+xVmGNq+OTbGewMyKZtKyIFI9LH kFUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=resent-message-id:sender:errors-to:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:message-id:resent-to:to:resent-from:resent-date :date:mime-version:from:dkim-signature:delivered-to; bh=zmYPJOoqeSM8DehjPymG4B/8XR+olXVrQzmLtByPBU8=; b=x/QjNJmQ2gXKxlF3LGlwdMBpPgzXlOl+vslvi3IdgVYgMoSoR6aNZ0rdHxBuQQKi7e RWTLRByPlCjLg/lrIdAp1TIMNjxlXpjEatTiOBwvW6jmamSB3mIxN3TGyaQQjYgzVzuD iAI+SRkJ6iw6aQwuGSnMVhKgu2MrszvsinZb5HEPlbmKNcmvPdvj5Bd6+glN4TWuqb13 y7AgT8x6S0ULsHxgEHfRMJGX01mbAWBLQUkrvxMWgjjSHUTfkUHbIbL52T0uF1HLu0I1 u/whsItl+YogNdEEbY9YDh+WCvHQpPChWFGzqIwlZKUYxX7zgI5aIiIH547K5dFu+dl8 fZGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@charliemonroe.net header.s=default header.b=onbu6D2m; 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 x21si4033480eds.603.2021.12.10.02.41.22; Fri, 10 Dec 2021 02:41:22 -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=@charliemonroe.net header.s=default header.b=onbu6D2m; 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 56B5D68AE33; Fri, 10 Dec 2021 12:41:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from gateway20.websitewelcome.com (gateway20.websitewelcome.com [192.185.58.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B8DF68ACE5 for ; Fri, 10 Dec 2021 12:41:11 +0200 (EET) Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway20.websitewelcome.com (Postfix) with ESMTP id 67FAA4017D8F2 for ; Fri, 10 Dec 2021 04:41:07 -0600 (CST) Received: from cloud19.hostgator.com ([108.167.165.127]) by cmsmtp with SMTP id vdKrmaXGlqH05vdKrm4hJd; Fri, 10 Dec 2021 04:41:06 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=charliemonroe.net; s=default; h=Message-Id:Resent-To:To:Resent-From: Resent-Date:Subject:Date:Mime-Version:Content-Type:From:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Sender: Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=+tn1HNsZBhGGRZ6f3F4B2DuZDhZidu8TujMhVrDFXB4=; b=onbu6D2mTt5fhv0CQP/1XN3Yqx JJlFPLIqy9rtw3Xp0wag3zma3wwsDlRe2Ggp39JmpoPhn3BJdTD2YPEaAupEM8XTO4s7RqlzfCaAi g2tgf7mmbrcjSCZHD3aOEHmll5B0U+MDTQRkeAhos7JlZCJnxVIRWLyyo8e/PfufnNrUYDPezAGgx WmTkJ90l1F1SsqnWK/033nSCy5UYMKX5L3aJV/ryyVfrtXOaKf2+gdGstaQTf+1oYTfgRx2wjadY7 ouKAPWDaqO47P65iphc9321Lz6IsRSaBGTomnLwzHYgrN8T0i+7DIndmw2z3w/TX1jPFGixucVraY k2JStfCw==; Received: from 37-48-24-174.nat.epc.tmcz.cz ([37.48.24.174]:25707 helo=smtpclient.apple) by cloud19.hostgator.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mvdKq-000Lfh-HK for ffmpeg-devel@ffmpeg.org; Fri, 10 Dec 2021 04:41:05 -0600 From: Charlie Monroe Mime-Version: 1.0 (Mac OS X Mail 15.0 \(3693.20.0.1.32\)) Date: Fri, 10 Dec 2021 11:20:18 +0100 Resent-Date: Fri, 10 Dec 2021 11:41:01 +0100 Resent-From: Charlie Monroe To: ffmpeg-devel@ffmpeg.org Resent-To: ffmpeg-devel@ffmpeg.org Message-Id: <8CDE01C5-A070-48F3-B8BF-3BA1EB31B9E4@charliemonroe.net> X-Mailer: Apple Mail (2.3693.20.0.1.32) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cloud19.hostgator.com X-AntiAbuse: Original Domain - ffmpeg.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - charliemonroe.net X-BWhitelist: no X-Source-IP: 37.48.24.174 X-Source-L: No X-Exim-ID: 1mvdKq-000Lfh-HK X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 37-48-24-174.nat.epc.tmcz.cz (smtpclient.apple) [37.48.24.174]:25707 X-Source-Auth: charlie@charliemonroe.net X-Email-Count: 2 X-Source-Cap: cjJvNWQwdTk7cjJvNWQwdTk7Y2xvdWQxOS5ob3N0Z2F0b3IuY29t X-Local-Domain: yes Subject: [FFmpeg-devel] [PATCH] Fix comparing NULL string when processing certain subtitle files. 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" Resent-Message-Id: <20211210104118.56B5D68AE33@ffbox0-bg.mplayerhq.hu> X-TUID: +LH8wEi4HEEr Hi, I hope I'm submitting this fix correctly - some subtitles will cause FFmpeg to crash when searching for a font in movtextencode. One such subtitles file is appended. The crash occurrs in find_font_id where the name argument passed is NULL. Here is an example command for reproducing the issue: ffmpeg -i test.mp4 -i test.ass -c:v copy -c:a copy -c:s 'mov_text' out.mp4 Cheers, Charlie Signed-off-by: Charlie Monroe --- libavcodec/movtextenc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 5869942ec0..df3a2dd97a 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -494,6 +494,9 @@ static void mov_text_alpha_cb(void *priv, int alpha, int alpha_id) static uint16_t find_font_id(MovTextContext *s, const char *name) { + if (name == NULL) + return 1; + int i; for (i = 0; i < s->font_count; i++) { if (!strcmp(name, s->fonts[i]))