mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-20 11:33:09 -08:00
Code Issues Projects Releases Wiki Activity

Fix crash in xwidget_end_redisplay

Browse source 
* src/xwidget.c (xwidget_end_redisplay): Always test if xv is
NULL.
This commit is contained in:
Po Lu 2021-11-14 09:58:21 +08:00
parent e29c9308b1
commit 9627b731c0
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/xwidget.c
View file

@ -2643,19 +2643,16 @@ xwidget_end_redisplay (struct window *w, struct glyph_matrix *matrix)
xwidget_end_redisplay (w->current_matrix); */
struct xwidget_view *xv
= xwidget_view_lookup (xwidget_from_id (glyph->u.xwidget), w);
#ifdef USE_GTK
/* FIXME: Is it safe to assume xwidget_view_lookup
always succeeds here? If so, this comment can be removed.
If not, the code probably needs fixing. */
eassume (xv);
xwidget_touch (xv);
#elif defined NS_IMPL_COCOA
/* In NS xwidget, xv can be NULL for the second or
/* In NS xwidget, xv can be NULL for the second or
later views for a model, the result of 1 to 1
model view relation enforcement. */
model view relation enforcement. `xwidget_view_lookup'
has also been observed to return NULL here on X-Windows
at least once, so stay safe and only touch it if it's
not NULL. */
if (xv)
xwidget_touch (xv);
#endif
}
}
}