diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-04-20 20:53:02 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-04-20 21:42:57 -0400 |
| commit | 5587ee0c30e83e7d47a872d48522672d5625a72f (patch) | |
| tree | 5cb368eeb356b6226e71e7168d7fd275e148c1e8 | |
| parent | 435ed3158cff7b9967aae2a33f52aab0d23720f6 (diff) | |
| download | gtk+-untrusted-beep.tar.gz | |
x11: Don't beep on untrusted displaysuntrusted-beep
This can trigger BadAccess, and we don't
want that.
Fixes: #3862
| -rw-r--r-- | gdk/x11/gdkdisplay-x11.c | 3 | ||||
| -rw-r--r-- | gdk/x11/gdksurface-x11.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 4350f2eef8..828889e977 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -1795,6 +1795,9 @@ _gdk_x11_display_update_grab_info_ungrab (GdkDisplay *display, static void gdk_x11_display_beep (GdkDisplay *display) { + if (!GDK_X11_DISPLAY (display)->trusted_client) + return; + #ifdef HAVE_XKB XkbBell (GDK_DISPLAY_XDISPLAY (display), None, 0, None); #else diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c index 210f584d64..aeaca9c0f9 100644 --- a/gdk/x11/gdksurface-x11.c +++ b/gdk/x11/gdksurface-x11.c @@ -4542,6 +4542,9 @@ gdk_x11_surface_beep (GdkSurface *surface) display = GDK_SURFACE_DISPLAY (surface); + if (!GDK_X11_DISPLAY (display)->trusted_client) + return FALSE; + #ifdef HAVE_XKB if (GDK_X11_DISPLAY (display)->use_xkb) { |