nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

root_atom_contents: properly clean up in all cases

This commit is contained in:
Michael Stapelberg 2016-01-08 20:15:34 +01:00
parent 54738f6ec8
commit d155496915
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libi3/root_atom_contents.c
View File

@ -31,14 +31,15 @@
char *root_atom_contents(const char *atomname, xcb_connection_t *provided_conn, int screen) { char *root_atom_contents(const char *atomname, xcb_connection_t *provided_conn, int screen) {
xcb_intern_atom_cookie_t atom_cookie; xcb_intern_atom_cookie_t atom_cookie;
xcb_intern_atom_reply_t *atom_reply; xcb_intern_atom_reply_t *atom_reply;
char *content; char *content = NULL;
size_t content_max_words = 256; size_t content_max_words = 256;
xcb_connection_t *conn = provided_conn; xcb_connection_t *conn = provided_conn;
if (provided_conn == NULL && if (provided_conn == NULL &&
((conn = xcb_connect(NULL, &screen)) == NULL || ((conn = xcb_connect(NULL, &screen)) == NULL ||
xcb_connection_has_error(conn))) xcb_connection_has_error(conn))) {
return NULL; return NULL;
}
atom_cookie = xcb_intern_atom(conn, 0, strlen(atomname), atomname); atom_cookie = xcb_intern_atom(conn, 0, strlen(atomname), atomname);
@ -46,8 +47,9 @@ char *root_atom_contents(const char *atomname, xcb_connection_t *provided_conn,
xcb_window_t root = root_screen->root; xcb_window_t root = root_screen->root;
atom_reply = xcb_intern_atom_reply(conn, atom_cookie, NULL); atom_reply = xcb_intern_atom_reply(conn, atom_cookie, NULL);
if (atom_reply == NULL) if (atom_reply == NULL) {
return NULL; goto out_conn;
}
xcb_get_property_cookie_t prop_cookie; xcb_get_property_cookie_t prop_cookie;
xcb_get_property_reply_t *prop_reply; xcb_get_property_reply_t *prop_reply;
@ -55,8 +57,7 @@ char *root_atom_contents(const char *atomname, xcb_connection_t *provided_conn,
XCB_GET_PROPERTY_TYPE_ANY, 0, content_max_words); XCB_GET_PROPERTY_TYPE_ANY, 0, content_max_words);
prop_reply = xcb_get_property_reply(conn, prop_cookie, NULL); prop_reply = xcb_get_property_reply(conn, prop_cookie, NULL);
if (prop_reply == NULL) { if (prop_reply == NULL) {
free(atom_reply); goto out_atom;
return NULL;
} }
if (xcb_get_property_value_length(prop_reply) > 0 && prop_reply->bytes_after > 0) { if (xcb_get_property_value_length(prop_reply) > 0 && prop_reply->bytes_after > 0) {
/* We received an incomplete value. Ask again but with a properly /* We received an incomplete value. Ask again but with a properly
@ -68,14 +69,11 @@ char *root_atom_contents(const char *atomname, xcb_connection_t *provided_conn,
XCB_GET_PROPERTY_TYPE_ANY, 0, content_max_words); XCB_GET_PROPERTY_TYPE_ANY, 0, content_max_words);
prop_reply = xcb_get_property_reply(conn, prop_cookie, NULL); prop_reply = xcb_get_property_reply(conn, prop_cookie, NULL);
if (prop_reply == NULL) { if (prop_reply == NULL) {
free(atom_reply); goto out_atom;
return NULL;
} }
} }
if (xcb_get_property_value_length(prop_reply) == 0) { if (xcb_get_property_value_length(prop_reply) == 0) {
free(atom_reply); goto out;
free(prop_reply);
return NULL;
} }
if (prop_reply->type == XCB_ATOM_CARDINAL) { if (prop_reply->type == XCB_ATOM_CARDINAL) {
/* We treat a CARDINAL as a >= 32-bit unsigned int. The only CARDINAL /* We treat a CARDINAL as a >= 32-bit unsigned int. The only CARDINAL
@ -85,9 +83,13 @@ char *root_atom_contents(const char *atomname, xcb_connection_t *provided_conn,
sasprintf(&content, "%.*s", xcb_get_property_value_length(prop_reply), sasprintf(&content, "%.*s", xcb_get_property_value_length(prop_reply),
(char *)xcb_get_property_value(prop_reply)); (char *)xcb_get_property_value(prop_reply));
} }
out:
free(prop_reply);
out_atom:
free(atom_reply);
out_conn:
if (provided_conn == NULL) if (provided_conn == NULL)
xcb_disconnect(conn); xcb_disconnect(conn);
free(atom_reply);
free(prop_reply);
return content; return content;
} }