Bugfix: Same xcb_send_event fix as 1e0033bce4

diff --git a/src/x.c b/src/x.c
index 5136bf445d6a156628e068861a38c3fec62ec0d7..e93e90e7687836b280e7be48e15695b6f725d563 100644 (file)
--- a/src/x.c
+++ b/src/x.c
@@ -215,20 +215,23 @@ void x_window_kill(xcb_window_t window, kill_window_t kill_window) {
         return;
     }
 
-    xcb_client_message_event_t ev;
-
-    memset(&ev, 0, sizeof(xcb_client_message_event_t));
-
-    ev.response_type = XCB_CLIENT_MESSAGE;
-    ev.window = window;
-    ev.type = A_WM_PROTOCOLS;
-    ev.format = 32;
-    ev.data.data32[0] = A_WM_DELETE_WINDOW;
-    ev.data.data32[1] = XCB_CURRENT_TIME;
+    /* Every X11 event is 32 bytes long. Therefore, XCB will copy 32 bytes.
+     * In order to properly initialize these bytes, we allocate 32 bytes even
+     * though we only need less for an xcb_configure_notify_event_t */
+    void *event = scalloc(32);
+    xcb_client_message_event_t *ev = event;
+
+    ev->response_type = XCB_CLIENT_MESSAGE;
+    ev->window = window;
+    ev->type = A_WM_PROTOCOLS;
+    ev->format = 32;
+    ev->data.data32[0] = A_WM_DELETE_WINDOW;
+    ev->data.data32[1] = XCB_CURRENT_TIME;
 
     LOG("Sending WM_DELETE to the client\n");
-    xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)&ev);
+    xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)ev);
     xcb_flush(conn);
+    free(event);
 }
 
 /*

diff --git a/src/xcb.c b/src/xcb.c
index 82991c9a18a9f0e47e6fab7f96417100f2c608e1..4497338b29af0554eeb11cfd1abf1963aed98260 100644 (file)
--- a/src/xcb.c
+++ b/src/xcb.c
@@ -219,19 +219,21 @@ void fake_absolute_configure_notify(Con *con) {
  *
  */
 void send_take_focus(xcb_window_t window) {
-    xcb_client_message_event_t ev;
-
-    memset(&ev, 0, sizeof(xcb_client_message_event_t));
+    /* Every X11 event is 32 bytes long. Therefore, XCB will copy 32 bytes.
+     * In order to properly initialize these bytes, we allocate 32 bytes even
+     * though we only need less for an xcb_configure_notify_event_t */
+    void *event = scalloc(32);
+    xcb_client_message_event_t *ev = event;
 
-    ev.response_type = XCB_CLIENT_MESSAGE;
-    ev.window = window;
-    ev.type = A_WM_PROTOCOLS;
-    ev.format = 32;
-    ev.data.data32[0] = A_WM_TAKE_FOCUS;
-    ev.data.data32[1] = XCB_CURRENT_TIME;
+    ev->response_type = XCB_CLIENT_MESSAGE;
+    ev->window = window;
+    ev->type = A_WM_PROTOCOLS;
+    ev->format = 32;
+    ev->data.data32[0] = A_WM_TAKE_FOCUS;
+    ev->data.data32[1] = XCB_CURRENT_TIME;
 
     DLOG("Sending WM_TAKE_FOCUS to the client\n");
-    xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)&ev);
+    xcb_send_event(conn, false, window, XCB_EVENT_MASK_NO_EVENT, (char*)ev);
 }
 
 /*