build: more checks for travis builds

diff --git a/.travis.yml b/.travis.yml
index 4ddf4eb5ecc4cff43e0c2e1c0cdc6fbf16680283..cac31183ceb4dd93d192d52aca681881bd0ec1de 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,11 @@ env:
     global:
         - PKG_CONFIG_PATH="${HOME}/.local/lib/pkgconfig"
         - PATH="${HOME}/.local/bin:/usr/local/bin:${PATH}"
-        - CFLAGS="-O0 -g -fno-omit-frame-pointer"
+        - CFLAGS="-O2 -g -fno-omit-frame-pointer -DMP_FREELIST_SIZE=0"
         - LD_LIBRARY_PATH="${HOME}/.local/lib"
         - DYLD_LIBRARY_PATH="${HOME}/.local/lib"
+        - MALLOC_CHECK_=3
+        - MALLOC_PERTURB_=223
 before_script:
     - ./scripts/bootstrap-depends.sh ${HOME}/.local
 script:

diff --git a/contrib/ccan/asprintf/asprintf.c b/contrib/ccan/asprintf/asprintf.c
index e9e02d7dd7482bbe2919397d978f46ca6f8d489c..9e66e1348630443a200cc0e5f81e6a3ae5102595 100644 (file)
--- a/contrib/ccan/asprintf/asprintf.c
+++ b/contrib/ccan/asprintf/asprintf.c
@@ -16,7 +16,7 @@ char *PRINTF_FMT(1, 2) afmt(const char *fmt, ...)
        return ptr;
 }
 
-#if !HAVE_ASPRINTF
+#if !HAVE_ASPRINTF && !defined(__USE_FORTIFY_LEVEL)
 #include <stdarg.h>
 #include <stdlib.h>
 

diff --git a/contrib/ccan/asprintf/asprintf.h b/contrib/ccan/asprintf/asprintf.h
index 958e244b56bc7a73ec71907da85dfcf810266315..37da83e98972d429ac02f084314e02ec8f7a9dd0 100644 (file)
--- a/contrib/ccan/asprintf/asprintf.h
+++ b/contrib/ccan/asprintf/asprintf.h
@@ -12,7 +12,7 @@
  */
 char *PRINTF_FMT(1, 2) afmt(const char *fmt, ...);
 
-#if HAVE_ASPRINTF
+#if HAVE_ASPRINTF || defined(__USE_FORTIFY_LEVEL)
 #include <stdio.h>
 #else
 #include <stdarg.h>

diff --git a/daemon/worker.c b/daemon/worker.c
index 1edf36f4e05518618cbb7e3183fdf5017a0a7109..1af988fe5f3f8d857183a7b37b9827efd4f6d3ac 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -111,7 +111,7 @@ static uv_handle_t *ioreq_spawn(struct qr_task *task, int socktype)
        struct session *session = handle->data;
        session->outgoing = true;
        int ret = array_push(session->tasks, task);
-       if (ret != 0) {
+       if (ret < 0) {
                io_deinit(handle);
                req_release(task->worker, (struct req *)handle);
                return NULL;