From 48e6bf1e48c05e97e21e7ed948781ee39dac3d75 Mon Sep 17 00:00:00 2001 From: okan Date: Mon, 11 Mar 2019 15:25:46 +0000 Subject: [PATCH] Check the atom type on propertynotify before iterating. --- app/cwm/xevents.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/cwm/xevents.c b/app/cwm/xevents.c index ce3f740e6..80590beff 100644 --- a/app/cwm/xevents.c +++ b/app/cwm/xevents.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: xevents.c,v 1.145 2019/03/10 22:53:11 okan Exp $ + * $OpenBSD: xevents.c,v 1.146 2019/03/11 15:25:46 okan Exp $ */ /* @@ -210,9 +210,11 @@ xev_handle_propertynotify(XEvent *ee) /* do nothing */ break; } - } else if ((sc = screen_find(e->window)) != NULL) { - if (e->atom == ewmh[_NET_DESKTOP_NAMES]) - xu_ewmh_net_desktop_names(sc); + } else { + if (e->atom == ewmh[_NET_DESKTOP_NAMES]) { + if ((sc = screen_find(e->window)) != NULL) + xu_ewmh_net_desktop_names(sc); + } } }