Revert temporary ASAN changes; enable VCDIFF_TOOLS for MINGW32 builds (as noted in https://github.com/jmacd/xdelta/issues/205)

3 files changed, 10 insertions, 10 deletions

diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am
index aaf8fb9..73895b6 100644
--- a/xdelta3/Makefile.am
+++ b/xdelta3/Makefile.am
@@ -40,10 +40,8 @@ xdelta3regtest_SOURCES = $(common_SOURCES) \
 WFLAGS = -Wall -Wshadow -fno-builtin -Wextra -Wsign-compare \
          -Wextra -Wno-unused-parameter -Wno-unused-function
 
-# TODO: DO NOT RELEASE
-ASAN = -fno-omit-frame-pointer -fsanitize=address
-C_WFLAGS = $(WFLAGS) -pedantic -std=c99 $(ASAN)
-CXX_WFLAGS = $(WFLAGS) $(ASAN)
+C_WFLAGS = $(WFLAGS) -pedantic -std=c99
+CXX_WFLAGS = $(WFLAGS)
 
 common_CFLAGS = \
               -DREGRESSION_TEST=1 \
diff --git a/xdelta3/run_release.sh b/xdelta3/run_release.sh
index 7d0d0c6..c38c2c9 100755
--- a/xdelta3/run_release.sh
+++ b/xdelta3/run_release.sh
@@ -12,7 +12,9 @@ MAKEFLAGS="-j 10"
 BUILDDIR=${SRCDIR}/build
 LZMASRC=${BUILDDIR}/${LZMA}
 
-MINGW_CFLAGS="-DEXTERNAL_COMPRESSION=0 -DVCDIFF_TOOLS=0"
+NONWIN_CFLAGS="-fno-omit-frame-pointer -fsanitize=address"
+
+MINGW_CFLAGS="-DEXTERNAL_COMPRESSION=0"
 MINGW_CFLAGS="${MINGW_CFLAGS} -DXD3_WIN32=1 -DSHELL_TESTS=0"
 
 MYOS=`uname`
@@ -204,14 +206,14 @@ EOF
 # Native compiles
 if [ "${MYOS}" == "Linux" ]; then
     # Linux
-    buildall x86_64-pc-linux-gnu -m32
-    buildall x86_64-pc-linux-gnu -m64
+    buildall x86_64-pc-linux-gnu -m32 "${NONWIN_CFLAGS}"
+    buildall x86_64-pc-linux-gnu -m64 "${NONWIN_CFLAGS}"
 fi
 
 if [ "${MYOS}" == "Darwin" ]; then
     # OS X
-    buildall x86_64-apple-darwin -m32
-    buildall x86_64-apple-darwin -m64
+    buildall x86_64-apple-darwin -m32 "${NONWIN_CFLAGS}"
+    buildall x86_64-apple-darwin -m64 "${NONWIN_CFLAGS}"
 fi
 
 # Cross compile
diff --git a/xdelta3/testing/file.h b/xdelta3/testing/file.h
index 05f9dde..c6f3c7b 100644
--- a/xdelta3/testing/file.h
+++ b/xdelta3/testing/file.h
@@ -50,7 +50,7 @@ public:
       }
       data_ = new uint8_t[data_size_];
       memcpy(data_, tmp, size_);
-      delete tmp;
+      delete [] tmp;
     }
 
     memcpy(data_ + size_, data, size);