[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 1da5b2c: Avoid segfault when set-fontset-font is called from non-
From: |
Eli Zaretskii |
Subject: |
master 1da5b2c: Avoid segfault when set-fontset-font is called from non-GUI frames |
Date: |
Fri, 30 Jul 2021 14:19:04 -0400 (EDT) |
branch: master
commit 1da5b2c60b6ad3747046cbe9060d35a6d110a97c
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Avoid segfault when set-fontset-font is called from non-GUI frames
* src/fontset.c (check_fontset_name): Avoid crashes if this is
called from a non-GUI frame. (Bug#49782)
---
src/fontset.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/fontset.c b/src/fontset.c
index 332be6c..52c7e38 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1356,6 +1356,9 @@ check_fontset_name (Lisp_Object name, Lisp_Object *frame)
int id;
struct frame *f = decode_live_frame (*frame);
+ if (!FRAME_WINDOW_P (f))
+ error ("Can't use fontsets in non-GUI frames");
+
XSETFRAME (*frame, f);
if (EQ (name, Qt))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 1da5b2c: Avoid segfault when set-fontset-font is called from non-GUI frames,
Eli Zaretskii <=