From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 9 Jan 2016 11:41:02 +0000 (+0100)
Subject: i3test::XTEST: free errors and connections with errors
X-Git-Tag: 4.12~56
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f3a5796a8b6146792e648b315682a627f63847bf;hp=9dde0b9b18817e3aeb6104f2954998557f07c8ec;p=i3%2Fi3

i3test::XTEST: free errors and connections with errors
---

diff --git a/testcases/lib/i3test/XTEST.pm b/testcases/lib/i3test/XTEST.pm
index 9ec083b1..92adde42 100644
--- a/testcases/lib/i3test/XTEST.pm
+++ b/testcases/lib/i3test/XTEST.pm
@@ -59,6 +59,9 @@ bool inlinec_connect() {
 
     if ((conn = xcb_connect(NULL, &screen)) == NULL ||
         xcb_connection_has_error(conn)) {
+        if (conn != NULL) {
+            xcb_disconnect(conn);
+        }
         fprintf(stderr, "Could not connect to X11\n");
         return false;
     }
@@ -79,6 +82,7 @@ bool inlinec_connect() {
         conn, xcb_xkb_use_extension(conn, XCB_XKB_MAJOR_VERSION, XCB_XKB_MINOR_VERSION), &err);
     if (err != NULL || usereply == NULL) {
         fprintf(stderr, "xcb_xkb_use_extension() failed\n");
+        free(err);
         return false;
     }
     free(usereply);
@@ -104,6 +108,7 @@ bool set_xkb_group(int group) {
         0);                      /* groupLatch */
     if ((err = xcb_request_check(conn, cookie)) != NULL) {
         fprintf(stderr, "X error code %d\n", err->error_code);
+        free(err);
         return false;
     }
     return true;
@@ -124,6 +129,7 @@ bool xtest_input(int type, int detail, int x, int y) {
         XCB_NONE);        /* deviceid */
     if ((err = xcb_request_check(conn, cookie)) != NULL) {
         fprintf(stderr, "X error code %d\n", err->error_code);
+        free(err);
         return false;
     }