From: Fernando Tarlá Cardoso Lemos <fernandotcl@gmail.com>
Date: Thu, 28 Jul 2011 23:40:05 +0000 (-0300)
Subject: Don't leak the cursor_id.
X-Git-Tag: 4.0~14^2~27
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ae9c90ba1996f174c39ace74b77ebb3e0602d686;p=i3%2Fi3

Don't leak the cursor_id.

Fixes a server-side leak. The cursor_id is not needed when we're
using themed cursors (we never freed it either).
---

diff --git a/src/xcb.c b/src/xcb.c
index 07f3ce1e..b88b7673 100644
--- a/src/xcb.c
+++ b/src/xcb.c
@@ -93,7 +93,6 @@ uint32_t get_colorpixel(char *hex) {
 xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_class,
         enum xcursor_cursor_t cursor, bool map, uint32_t mask, uint32_t *values) {
     xcb_window_t result = xcb_generate_id(conn);
-    xcb_cursor_t cursor_id = xcb_generate_id(conn);
 
     /* If the window class is XCB_WINDOW_CLASS_INPUT_ONLY, depth has to be 0 */
     uint16_t depth = (window_class == XCB_WINDOW_CLASS_INPUT_ONLY ? 0 : XCB_COPY_FROM_PARENT);
@@ -115,6 +114,7 @@ xcb_window_t create_window(xcb_connection_t *conn, Rect dims, uint16_t window_cl
         values[0] = xcursor_get_cursor(cursor);
         xcb_change_window_attributes(conn, result, mask, values);
     } else {
+        xcb_cursor_t cursor_id = xcb_generate_id(conn);
         i3Font cursor_font = load_font("cursor", false);
         int xcb_cursor = xcursor_get_xcb_cursor(cursor);
         xcb_create_glyph_cursor(conn, cursor_id, cursor_font.id, cursor_font.id,