From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 6E3EC4CACA for ; Thu, 7 Aug 2025 19:02:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 34D4F68D1C5; Thu, 7 Aug 2025 22:02:52 +0300 (EEST) Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.173]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 5AC4668D0FE for ; Thu, 7 Aug 2025 22:02:45 +0300 (EEST) Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-7086dcab64bso13545447b3.1 for ; Thu, 07 Aug 2025 12:02:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754593363; x=1755198163; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MizIxndVDm8HZVQbo9JnPFzM10sjFKbWOhLG0+NndD0=; b=NeK48FH+YYjzvHbtiGBfsNScIXM3c0HQ6hVKx/691B5II1RovSZ+I6cySf8KcC1WLi AeKwe5Ggew4FdZHHVUHU4AVFWpUHck0aXIcEsqwYlxCDq3MY7LOjmB/3x0FI42YEbmF9 gwY+ojIdMfUFNBJzc5JkSES0oOgkRaFwFC4gcBl2YVv2xuuzAwkE5jh+hc25+S5J75H9 GkBT1xaheBieYLqFB/iVx2am5K+77prVsG/YB9NLLKRow9dfwOlZ2oWepb+3mi14Cb4M HUTMBsi0kn0rvuUj7U66ydD4XOxMABfRAYtvewKypC5LIPXz8ufdZJCWrxCcJjCWd1aF PO5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754593363; x=1755198163; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MizIxndVDm8HZVQbo9JnPFzM10sjFKbWOhLG0+NndD0=; b=TDfmKRCp3LBC71dJi1QXADKheZLSpwSCfmtGRmzcgCUPpe0EDnGteCCmY4JSBqsbZY 4p9Uh415ZF1BngKVjmSCuTzQxn2Cw9OZiUCvVFp1xNIN1OA1ttnr4qf+gVvM3SHebORU FzyGJKMhOmadsiKolA4wue2GglRCk2Zx6PnijhCH8YV4ItfO1Fx7UaWM/5OX57+66b/m RqFsBlLFrzCXeB/VcTH354rbtymREY+1iGF9ruyc5QPEPm2xG2LoISdFPv6grnL/27bh 1jaA0WkhzvpGaSXxrPYaceZld7V439C2k8tNVxuz5xQkdPSGjJpis2QK3AhuKcmnzajX 51vA== X-Gm-Message-State: AOJu0YxvPtUVLJEua5ddtvgYfmDjzqYmY7k/s6nVvqB7kf2DKQ6h9GuZ mCg7A3C0ARXEFX3qf0o+6pbGfFUDrblrTHEvFb+ffojVM5X9ER/Hae3lRXK03A== X-Gm-Gg: ASbGncuqzKq/nbVb69BVV6cCHxpt6E0oWIHBWfeevrl0pzwdLUSspKrFN0tuHRN/5eB cBrvIAxgftFUgwZ0ZSqw+iCmMbSgOQC8+HyfTe2yb0jpTDvz+2HfkXzegnqUtQLGsNcBQ1R6r/e R9zuqBBOkLiVEZEGuNNfVT1QTXnR7PHD1yMyIj/9xOM5VmbcygL2m0cOjmuk1DboytyOrNMKZi4 pYkC7m3L11VoqJA+5qEPl67QDZEDirJ3SUzBE6SWadLcvqP/nxMDNLfYauirJpZv7jlfEmALAuO 94nMuwEVI6XBmdn12HPT72CjsLQruIGdpC+eL+NpBlV5uP25yl68GbdOCWl3Z9NjWd/zrjiuawy j4CgKwn03mZ4gkN1mCKygk+5dvDdSCeKDlFfcgpgr0rpc X-Google-Smtp-Source: AGHT+IGp9uUzDvE+lwfTUOUQ9kKbeMtBwmYZMPb8P2ooYVyzVPb2pcncLFtlrjeg10lQlwCGYvTCxQ== X-Received: by 2002:a05:690c:9688:b0:71b:efe7:bdba with SMTP id 00721157ae682-71bf0ef3b23mr1614467b3.40.1754593362316; Thu, 07 Aug 2025 12:02:42 -0700 (PDT) Received: from newman.cs.purdue.edu ([128.10.127.250]) by smtp.gmail.com with ESMTPSA id 00721157ae682-71b5a3a9b89sm47218627b3.15.2025.08.07.12.02.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Aug 2025 12:02:41 -0700 (PDT) From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Aug 2025 19:02:39 +0000 Message-Id: <20250807190239.5740-1-jiashengjiangcool@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavfilter/vf_drawtext: Add check for av_mallocz() to avoid potential NULL pointer dereference 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: Jiasheng Jiang 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: Add check for the return value of av_mallocz() to avoid potential NULL pointer dereference. Fixes: 1eeb59a209 ("avfilter/vf_drawtext: improve glyph shaping and positioning") Signed-off-by: Jiasheng Jiang --- libavfilter/vf_drawtext.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c index 674e1e53c1..2eb144b5bf 100644 --- a/libavfilter/vf_drawtext.c +++ b/libavfilter/vf_drawtext.c @@ -1437,6 +1437,11 @@ continue_on_failed: s->line_count = line_count; s->lines = av_mallocz(line_count * sizeof(TextLine)); s->tab_clusters = av_mallocz(s->tab_count * sizeof(uint32_t)); + if (!s->lines || !s->tab_clusters) { + ret = AVERROR(ENOMEM); + goto done; + } + for (i = 0; i < s->tab_count; ++i) { s->tab_clusters[i] = -1; } -- 2.25.1 _______________________________________________ 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".