From 42bfcc3d46a0fbcf563b9740efda93221a58479f Mon Sep 17 00:00:00 2001 From: Shane Bryldt Date: Thu, 5 Jan 2017 16:22:35 +0000 Subject: [PATCH] FS-9775: Fixed building libblade with address sanitizing support --- libs/libblade/configure.ac | 8 +++----- libs/libblade/src/blade_peer.c | 2 +- libs/libblade/src/blade_stack.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libs/libblade/configure.ac b/libs/libblade/configure.ac index b8e5829a90..98143950a3 100644 --- a/libs/libblade/configure.ac +++ b/libs/libblade/configure.ac @@ -241,11 +241,9 @@ AC_ARG_ENABLE(address_sanitizer, [enable_address_sanitizer="no"]) if test "${enable_address_sanitizer}" = "yes"; then - if test "x${ax_cv_c_compiler_vendor}" = "xclang" ; then - AM_CFLAGS="${AM_CFLAGS} -fsanitize=address -fno-omit-frame-pointer" - AM_CXXFLAGS="${AM_CXXFLAGS} -fsanitize=address -fno-omit-frame-pointer" - AM_LDFLAGS="${AM_LDFLAGS} -fsanitize=address" - fi + AM_CFLAGS="${AM_CFLAGS} -fsanitize=address -fno-omit-frame-pointer" + AM_CXXFLAGS="${AM_CXXFLAGS} -fsanitize=address -fno-omit-frame-pointer" + AM_LDFLAGS="${AM_LDFLAGS} -fsanitize=address" fi AC_ARG_WITH([libks], diff --git a/libs/libblade/src/blade_peer.c b/libs/libblade/src/blade_peer.c index 66aaf3ac32..e67e733b6b 100644 --- a/libs/libblade/src/blade_peer.c +++ b/libs/libblade/src/blade_peer.c @@ -60,7 +60,7 @@ KS_DECLARE(ks_status_t) blade_peer_destroy(blade_peer_t **bpP) flags = bp->flags; pool = bp->pool; - ks_pool_free(bp->pool, bp); + ks_pool_free(bp->pool, &bp); if (pool && (flags & BP_MYPOOL)) { ks_pool_close(&pool); diff --git a/libs/libblade/src/blade_stack.c b/libs/libblade/src/blade_stack.c index 8b791d8b2e..9dc4ba2f36 100644 --- a/libs/libblade/src/blade_stack.c +++ b/libs/libblade/src/blade_stack.c @@ -63,7 +63,7 @@ KS_DECLARE(ks_status_t) blade_handle_destroy(blade_handle_t **bhP) blade_peer_destroy(&bh->peer); - ks_pool_free(bh->pool, bh); + ks_pool_free(bh->pool, &bh); if (pool && (flags & BH_MYPOOL)) { ks_pool_close(&pool);