Merge pull request #2911 from i3/asan

i3bar: ensure get_buffer does not leak memory

diff --git a/.travis.yml b/.travis.yml
index 63f69ac860438bb508f214bbde48f0cae1a77ac2..de9ff3fcd43874b14130c356ae7a0b5778935ee7 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 sudo: false
 dist: trusty
+# TODO: remove “group” once trusty kernel is no longer affected by
+# https://github.com/google/sanitizers/issues/837
+group: deprecated-2017Q3
 services:
   - docker
 language: c

diff --git a/i3bar/src/child.c b/i3bar/src/child.c
index 814f041110d48db57c296a6cc0a47d59ce98954d..fe989c44c25a639c8f51e6f8589d2fa787db8abd 100644 (file)
--- a/i3bar/src/child.c
+++ b/i3bar/src/child.c
@@ -333,10 +333,12 @@ static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) {
                 break;
             }
             ELOG("read() failed!: %s\n", strerror(errno));
+            FREE(buffer);
             exit(EXIT_FAILURE);
         }
         if (n == 0) {
             ELOG("stdin: received EOF\n");
+            FREE(buffer);
             *ret_buffer_len = -1;
             return NULL;
         }