summaryrefslogtreecommitdiff
path: root/src/fontset.c
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2021-07-30 21:17:58 +0300
committerEli Zaretskii <eliz@gnu.org>2021-07-30 21:17:58 +0300
commit1da5b2c60b6ad3747046cbe9060d35a6d110a97c (patch)
tree090ee5e457f9972307171f98704f76ee8f78d85b /src/fontset.c
parent55a9c17cef78b1fd3da42bcc2ab55d4acbaa24eb (diff)
downloademacs-1da5b2c60b6ad3747046cbe9060d35a6d110a97c.tar.gz
emacs-1da5b2c60b6ad3747046cbe9060d35a6d110a97c.tar.bz2
emacs-1da5b2c60b6ad3747046cbe9060d35a6d110a97c.zip
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)
Diffstat (limited to 'src/fontset.c')
-rw-r--r--src/fontset.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/fontset.c b/src/fontset.c
index 332be6c39d1..52c7e381e15 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))