]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-9775: Fixed building libblade with address sanitizing support
authorShane Bryldt <astaelan@gmail.com>
Thu, 5 Jan 2017 16:22:35 +0000 (16:22 +0000)
committerMike Jerris <mike@jerris.com>
Wed, 25 Jan 2017 20:59:38 +0000 (14:59 -0600)
libs/libblade/configure.ac
libs/libblade/src/blade_peer.c
libs/libblade/src/blade_stack.c

index b8e5829a9087ab1a1ed1998265710b8acbe44441..98143950a3aa6a305ea0c63efd570347cb97ef83 100644 (file)
@@ -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],
index 66aaf3ac32efcd7ca7c1bd2bf9c8115b3e4ae208..e67e733b6b3ca864edec13f00ffd4f96d5d3dfc8 100644 (file)
@@ -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);
index 8b791d8b2e97498a6b2df73f0895dc24025ced01..9dc4ba2f36407e5aca7d465cd5bb6c44288dfd13 100644 (file)
@@ -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);