From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1p29fh-00025O-7H for mharc-grub-devel@gnu.org; Mon, 05 Dec 2022 06:30:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p29fd-00024c-K0 for grub-devel@gnu.org; Mon, 05 Dec 2022 06:30:01 -0500 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p29fc-00058y-3V for grub-devel@gnu.org; Mon, 05 Dec 2022 06:30:01 -0500 Received: by mail-pf1-x42c.google.com with SMTP id c7so7660698pfc.12 for ; Mon, 05 Dec 2022 03:29:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3ypKAUfrJc164YBsoSZhzUW32OAll38GT95PXeXMe7c=; b=hMhzWNjMXVC89FTa0efiIdxoJKRW1aeYlVZHN8WhPePO1fQ3/4sAPPdszczHDKKv9i oiiISenKo3Q4C0eqS3NX0AR1P5t5EY+Boy/vSeLEIzQp41HPMuqhf/OucR/iSEHFR85f ABVuzgL5ikIC4k7EGrmnA9qgrb0KYoVANTH5vR/uLvpPeSsAvRCmvMXBtFOFFlRDQwVa +MpyGKQWI0Y1WUqqs4FANbOJWRMFM1cGBkS7zaB9bcJGHu5adigifqIA2uX8AR6AePfV FmRmC97WiX/7aJuHn3N+ujNdq06YUlFObxdXn4WMOxbmnLuhPZHjVHZE810JZ8eZsZqJ ek2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3ypKAUfrJc164YBsoSZhzUW32OAll38GT95PXeXMe7c=; b=Sc0zkG49GCT9GeaFsVp/rlOu4DR/D1bVBtNncxhfTMxBDWDoXfiH9W8ydY68ya7LZ6 M0h1Oe0etkTyUZknvrUwJBgzcHUCTUSjSyJoJ8jW4g72q6yeoszabXBtfKkX+1AX9aTi Z6FJ33h/1o+86Yq93VROjuS45VhORiNluWossx3xgjPVyYNWAn9x4KQO7fy4fP0qWLW5 iQInE7pd641GHCH4DAM7Q25M0km58c86oAGsrUqY3E4LFARZ8d5EcXCmKFQPqNcpqCRh GcTjZIgL8988z39dSkTsWSropCWBVp8BK9r1z5rYgZrpY6tjEQupxOhYC9ER/Ch+Dk4y mwLg== X-Gm-Message-State: ANoB5pmf9h4Pa86iY+s+IgFcCztmxJ4u9B3GFTOeF6/kVjmecJF0dwno RMsq4XFBMyJ38brZwXtAEH4IIHa9mUs= X-Google-Smtp-Source: AA0mqf4J5+IdufVy8tcRJt6z0DPCKUPku07WL5zV8Z4QvKTwCdvIkkD3GibsTCU8hyLsF7aqJsM9LA== X-Received: by 2002:a63:110d:0:b0:46f:6225:c2f9 with SMTP id g13-20020a63110d000000b0046f6225c2f9mr73792373pgl.225.1670239798888; Mon, 05 Dec 2022 03:29:58 -0800 (PST) Received: from localhost.localdomain (ec2-13-113-80-70.ap-northeast-1.compute.amazonaws.com. [13.113.80.70]) by smtp.gmail.com with ESMTPSA id b7-20020a170902650700b0018869119e37sm10381729plk.142.2022.12.05.03.29.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Dec 2022 03:29:58 -0800 (PST) From: Zhang Boyang To: grub-devel@gnu.org Cc: Zhang Boyang Subject: [PATCH 2/5] font: Assign null_font to unknown_glyph Date: Mon, 5 Dec 2022 19:29:37 +0800 Message-Id: <20221205112940.246486-3-zhangboyang.id@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221205112940.246486-1-zhangboyang.id@gmail.com> References: <20221205112940.246486-1-zhangboyang.id@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::42c; envelope-from=zhangboyang.id@gmail.com; helo=mail-pf1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2022 11:30:02 -0000 Like glyphs in ascii_font_glyph[], assign null_font to unknown_glyph->font in order to prevent grub_font_get_*() from dereferencing NULL pointer. Signed-off-by: Zhang Boyang --- grub-core/font/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/grub-core/font/font.c b/grub-core/font/font.c index 19a47f873..674043d0d 100644 --- a/grub-core/font/font.c +++ b/grub-core/font/font.c @@ -177,6 +177,7 @@ grub_font_loader_init (void) unknown_glyph->offset_x = 0; unknown_glyph->offset_y = -3; unknown_glyph->device_width = 8; + unknown_glyph->font = &null_font; grub_memcpy (unknown_glyph->bitmap, unknown_glyph_bitmap, sizeof (unknown_glyph_bitmap)); -- 2.30.2