From 6abcc5f656b2815dcd8c65fcc116280ac43f341f Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sat, 7 Mar 2009 02:44:46 +0100 Subject: [PATCH] =?utf8?q?Fix=20some=20bugs=20found=20by=20using=20raster?= =?utf8?q?=E2=80=99s=20wm=5Ftorture?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/handlers.c | 4 ++++ src/mainx.c | 27 +++++++++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/handlers.c b/src/handlers.c index 88b09b6b..fbc507ea 100644 --- a/src/handlers.c +++ b/src/handlers.c @@ -475,6 +475,10 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) { LOG("window's name changed.\n"); + if (prop == NULL) { + LOG("prop == NULL\n"); + return 1; + } Client *client = table_get(byChild, window); if (client == NULL) return 1; diff --git a/src/mainx.c b/src/mainx.c index 0a60c9e6..7b8d27f0 100644 --- a/src/mainx.c +++ b/src/mainx.c @@ -143,7 +143,7 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child, /* Update the data structures */ Client *old_focused = CUR_CELL->currently_focused; - CUR_CELL->currently_focused = new; + new->container = CUR_CELL; new->frame = xcb_generate_id(conn); @@ -184,14 +184,15 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child, new->titlegc = xcb_generate_id(conn); xcb_create_gc(conn, new->titlegc, new->frame, 0, 0); - /* Put our data structure (Client) into the table */ - table_put(byParent, new->frame, new); - table_put(byChild, child, new); - /* Moves the original window into the new frame we've created for it */ new->awaiting_useless_unmap = true; xcb_void_cookie_t cookie = xcb_reparent_window_checked(conn, child, new->frame, 0, font->height); - check_error(conn, cookie, "Could not reparent window"); + if (xcb_request_check(conn, cookie) != NULL) { + LOG("Could not reparent the window, aborting\n"); + xcb_destroy_window(conn, new->frame); + free(new); + return; + } /* We are interested in property changes */ mask = XCB_CW_EVENT_MASK; @@ -199,7 +200,18 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child, XCB_EVENT_MASK_STRUCTURE_NOTIFY | XCB_EVENT_MASK_ENTER_WINDOW; cookie = xcb_change_window_attributes_checked(conn, child, mask, values); - check_error(conn, cookie, "Could not change window attributes"); + if (xcb_request_check(conn, cookie) != NULL) { + LOG("Could not change window attributes, aborting\n"); + xcb_destroy_window(conn, new->frame); + free(new); + return; + } + + CUR_CELL->currently_focused = new; + + /* Put our data structure (Client) into the table */ + table_put(byParent, new->frame, new); + table_put(byChild, child, new); /* We need to grab the mouse buttons for click to focus */ xcb_grab_button(conn, false, child, XCB_EVENT_MASK_BUTTON_PRESS, @@ -441,7 +453,6 @@ int main(int argc, char *argv[], char *env[]) { /* Set up the atoms we support */ check_error(conn, xcb_change_property_checked(conn, XCB_PROP_MODE_REPLACE, root, atoms[_NET_SUPPORTED], ATOM, 32, 7, atoms), "Could not set _NET_SUPPORTED"); - /* Set up the window manager’s name */ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, atoms[_NET_SUPPORTING_WM_CHECK], WINDOW, 32, 1, &root); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, atoms[_NET_WM_NAME], atoms[UTF8_STRING], 8, strlen("i3"), "i3"); -- 2.39.5