>From e1a231961c36a3a5d1229aa5268b4515bd6aef31 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Tue, 9 Nov 2021 14:31:12 +0800 Subject: [PATCH] Make `kill_frame_xwidget_views' safe This makes kill_frame_xwidget_views still work even if the user injects nonsense into `xwidget-view-list'. * src/xwidget.c (kill_frame_xwidget_views): Check XWIDGET_VIEW_P. --- src/xwidget.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/xwidget.c b/src/xwidget.c index 614eb46d93..90178f441d 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -2388,7 +2388,8 @@ kill_frame_xwidget_views (struct frame *f) for (Lisp_Object tail = Vxwidget_view_list; CONSP (tail); tail = XCDR (tail)) { - if (XXWIDGET_VIEW (XCAR (tail))->frame == f) + if (XWIDGET_VIEW_P (XCAR (tail)) + && XXWIDGET_VIEW (XCAR (tail))->frame == f) rem = Fcons (XCAR (tail), rem); } -- 2.31.1