From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 28 May 2024 16:03:00 +0000 (+0300)
Subject: Avoid rare crashes in 'uncache_face'
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65f7cd58b926a9fd99f5ff827930e7901d5c877a;p=emacs.git

Avoid rare crashes in 'uncache_face'

* src/xfaces.c (realize_face): Prevent rare crashes in
'uncache_face' because 'former_face' is NULL (i.e. the face
corresponding to 'former_face_id' is no longer cached).
(Bug#71243)

(cherry picked from commit d9512da49514623ef3e35524dc894c06f2c0ce20)
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 258fbc52e64..e305cc7456f 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6057,7 +6057,8 @@ realize_face (struct face_cache *cache, Lisp_Object attrs[LFACE_VECTOR_SIZE],
     {
       /* Remove the former face.  */
       struct face *former_face = cache->faces_by_id[former_face_id];
-      uncache_face (cache, former_face);
+      if (former_face)
+	uncache_face (cache, former_face);
       free_realized_face (cache->f, former_face);
       SET_FRAME_GARBAGED (cache->f);
     }