From 18cfc36408fcb6ab2dd13d33ff02eb043ff77c36 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 23 Nov 2013 11:56:28 +0100 Subject: [PATCH] libi3/root_atom_contents: Free xcb reply structures Free memory allocated during xcb calls. --- libi3/root_atom_contents.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/libi3/root_atom_contents.c b/libi3/root_atom_contents.c index 697441eb..236f1b99 100644 --- a/libi3/root_atom_contents.c +++ b/libi3/root_atom_contents.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -51,20 +52,35 @@ char *root_atom_contents(const char *atomname, xcb_connection_t *provided_conn, prop_cookie = xcb_get_property_unchecked(conn, false, root, atom_reply->atom, XCB_GET_PROPERTY_TYPE_ANY, 0, PATH_MAX); prop_reply = xcb_get_property_reply(conn, prop_cookie, NULL); - if (prop_reply == NULL || xcb_get_property_value_length(prop_reply) == 0) + if (prop_reply == NULL) { + free(atom_reply); return NULL; + } + if (xcb_get_property_value_length(prop_reply) == 0) { + free(atom_reply); + free(prop_reply); + return NULL; + } if (prop_reply->type == XCB_ATOM_CARDINAL) { /* We treat a CARDINAL as a >= 32-bit unsigned int. The only CARDINAL * we query is I3_PID, which is 32-bit. */ - if (asprintf(&content, "%u", *((unsigned int*)xcb_get_property_value(prop_reply))) == -1) + if (asprintf(&content, "%u", *((unsigned int*)xcb_get_property_value(prop_reply))) == -1) { + free(atom_reply); + free(prop_reply); return NULL; + } } else { if (asprintf(&content, "%.*s", xcb_get_property_value_length(prop_reply), - (char*)xcb_get_property_value(prop_reply)) == -1) + (char*)xcb_get_property_value(prop_reply)) == -1) { + free(atom_reply); + free(prop_reply); return NULL; + } } if (provided_conn == NULL) xcb_disconnect(conn); + free(atom_reply); + free(prop_reply); return content; }