Merge ~6 AFL decoder fixes from head; AFL support in run_release.sh

13 files changed, 225 insertions, 169 deletions

diff --git a/.gitignore b/.gitignore
index 58a9163..a5b5926 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,6 @@ ltversion.m4
 lt~obsolete.m4
 missing
 stamp-h1
-xdelta3
+xdelta3/xdelta3
 xdelta3decode
 xdelta3regtest
diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am
index 322d88d..11f75b0 100644
--- a/xdelta3/Makefile.am
+++ b/xdelta3/Makefile.am
@@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 bin_PROGRAMS = xdelta3
 noinst_PROGRAMS = xdelta3regtest xdelta3decode xdelta3checksum
 
+export AFL_HARDEN
+
 common_SOURCES = \
           xdelta3-blkcache.h \
           xdelta3-decode.h \
@@ -48,6 +50,7 @@ WFLAGS = -Wall -Wshadow -fno-builtin -Wextra -Wsign-compare \
 C_WFLAGS = $(WFLAGS) -pedantic -std=c99
 CXX_WFLAGS = $(WFLAGS)
 
+# TODO add -O3
 common_CFLAGS = \
               -DREGRESSION_TEST=1 \
               -DSECONDARY_DJW=1 \
@@ -59,7 +62,7 @@ if DEBUG_SYMBOLS
 endif
 
 # For additional debugging, add -DXD3_DEBUG=1, 2, 3, ...
-xdelta3_CFLAGS = $(C_WFLAGS) $(common_CFLAGS) -DXD3_DEBUG=1
+xdelta3_CFLAGS = $(C_WFLAGS) $(common_CFLAGS) -DXD3_DEBUG=0
 xdelta3_LDADD = -lm
 
 xdelta3decode_CFLAGS = \
diff --git a/xdelta3/configure.ac b/xdelta3/configure.ac
index af96bc2..dbcac4f 100644
--- a/xdelta3/configure.ac
+++ b/xdelta3/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Xdelta3], [3.0.10], [josh.macdonald@gmail.com], 
+AC_INIT([Xdelta3], [3.0.11], [josh.macdonald@gmail.com], 
         [xdelta3], [http://xdelta.org/])
 AC_PREREQ([2.68])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/xdelta3/run_release.sh b/xdelta3/run_release.sh
index 1b9dc8c..f38c44d 100755
--- a/xdelta3/run_release.sh
+++ b/xdelta3/run_release.sh
@@ -12,8 +12,8 @@ MAKEFLAGS="-j 10"
 BUILDDIR=${SRCDIR}/build
 LZMASRC=${BUILDDIR}/${LZMA}
 
-MINGW_CFLAGS="-DEXTERNAL_COMPRESSION=0 -DVCDIFF_TOOLS=0"
-MINGW_CFLAGS="${MINGW_CFLAGS} -DXD3_WIN32=1 -DSHELL_TESTS=0"
+NONWIN_CFLAGS=""
+MINGW_CFLAGS="-DEXTERNAL_COMPRESSION=0 -DXD3_WIN32=1 -DSHELL_TESTS=0"
 
 MYOS=`uname`
 DATE=`date`
@@ -40,15 +40,15 @@ if [ "${TMPDIR}" != "" ]; then
     XTMP="${TMPDIR}"
 fi
 
-find build -type f 2> /dev/null | xargs rm
+find build -type f 2> /dev/null | xargs rm -f
 
 function setup {
-    mkdir -p ${BUILDDIR}
+    libtoolize
+    automake --add-missing
     aclocal -I m4
     autoheader
-    libtoolize
     automake
-    automake --add-missing
+    autoheader
     autoconf
 }
 
@@ -57,7 +57,7 @@ function try {
     shift
     local dir=$1
     shift
-    echo -n "   ${w} ..."
+    echo -n "   ${w} ... "
     (cd "${dir}" && "$@" >${w}.stdout 2>${w}.stderr)
     local s=$?
     if [ ${s} -eq 0 ]; then
@@ -91,11 +91,11 @@ function buildlzma {
 
     try build-lzma ${target} make ${MAKEFLAGS}
     if [ $? -ne 0 ]; then
-        return
+        return
     fi
     try install-lzma ${target} make install
     if [ $? -ne 0 ]; then
-        return
+        return
     fi
 }
 
@@ -105,14 +105,26 @@ function buildit {
     local usizebits=$3
     local offsetbits=$4
     local cargs=$5
-    local largs=$6
+    local afl=$6
     local BM="${host}${march}"
+    local USECC="${CC}"
+    local USECXX="${CXX}"
+    local LIBBM="${BM}"
+
+    if [ "${afl}" = "1" ]; then
+        USECC="afl-gcc"
+        USECXX="afl-g++"
+        BM="${BM}-afl"
+    fi
+
     local D="build/${BM}/usize${usizebits}/xoff${offsetbits}"
     local BMD="${BM}-${usizebits}-${offsetbits}"
+
     local FULLD="${SRCDIR}/${D}"
-    local CFLAGS="${march} ${cargs} -g -I${SRCDIR}/build/lib-${BM}/include"
-    local CXXFLAGS="${march} ${cargs} -g -I${SRCDIR}/build/lib-${BM}/include"
-    local LDFLAGS="${largs} ${march} -L${SRCDIR}/build/lib-${BM}/lib"
+    local CFLAGS="${march} ${cargs} -I${SRCDIR}/build/lib-${LIBBM}/include"
+    local CXXFLAGS="${march} ${cargs} -I${SRCDIR}/build/lib-${LIBBM}/include"
+    local LDFLAGS="${march} -L${SRCDIR}/build/lib-${LIBBM}/lib"
+
     mkdir -p ${D}
 
     echo "      ... ${BMD}"
@@ -123,7 +135,7 @@ function buildit {
 # ${CFLAGS}
 .PHONY: build-${BMD}
 build-${BMD}:
-        (cd ${D} && make all)
+        (cd ${D} && make all && make install)
 
 .PHONY: clean-${BMD}
 clean-${BMD}:
@@ -167,22 +179,24 @@ EOF
                   --enable-debug-symbols \
                   "CFLAGS=${CFLAGS}" \
                   "CXXFLAGS=${CXXFLAGS}" \
-                  "LDFLAGS=${LDFLAGS}"
+                  "LDFLAGS=${LDFLAGS}" \
+                  "CC=${USECC}" \
+                  "CXX=${USECXX}"
     if [ $? -ne 0 ]; then
         return
     fi
 
-    try build-xdelta ${FULLD} make ${MAKEFLAGS} all
-    if [ $? -ne 0 ]; then
-        return
-    fi
+    # try build-xdelta ${FULLD} make ${MAKEFLAGS} all
+    # if [ $? -ne 0 ]; then
+    #   return
+    # fi
 
-    try install-xdelta ${FULLD} make install
+    # try install-xdelta ${FULLD} make install
 }
 
 function buildall {
     echo ""
-    echo "Host $1$2"
+    echo "Host $1$2 afl=$4"
     echo ""
 
     buildlzma "$1" "$2"
@@ -202,28 +216,31 @@ cat > Makefile.test <<EOF
 # Auto-generated ${DATE} -*- Mode: Makefile -*-
 TMP = ${XTMP}
 
+all: linux windows apple
+
 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}" "0"
+    buildall x86_64-pc-linux-gnu -m32 "${NONWIN_CFLAGS}" "1"
+    buildall x86_64-pc-linux-gnu -m64 "${NONWIN_CFLAGS}" "0"
+    buildall x86_64-pc-linux-gnu -m64 "${NONWIN_CFLAGS}" "1"
 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}" "0"
+    buildall x86_64-apple-darwin -m64 "${NONWIN_CFLAGS}" "0"
 fi
 
 # Cross compile
-buildall i686-w64-mingw32 -mconsole "${MINGW_CFLAGS}"
-buildall x86_64-w64-mingw32 -mconsole "${MINGW_CFLAGS}"
+buildall i686-w64-mingw32 -mconsole "${MINGW_CFLAGS}" "0"
+buildall x86_64-w64-mingw32 -mconsole "${MINGW_CFLAGS}" "0"
 
 cat >> Makefile.test <<EOF
 
-all: linux windows apple
 clean: ${CLEAN}
 
 .PHONY: linux windows apple
diff --git a/xdelta3/testing/checksum_test.cc b/xdelta3/testing/checksum_test.cc
index 5b57a49..c508753 100644
--- a/xdelta3/testing/checksum_test.cc
+++ b/xdelta3/testing/checksum_test.cc
@@ -473,7 +473,7 @@ struct test_result : public test_result_base {
     usize_t i;
 
     for (i = 3; i <= bits; i += 1) {
-      if (slots <= (1 << i)) {
+      if (slots <= (1U << i)) {
         return i - Checksum::compaction;
       }
     }
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);
diff --git a/xdelta3/xdelta3-decode.h b/xdelta3/xdelta3-decode.h
index 7999bc3..abe8c83 100644
--- a/xdelta3/xdelta3-decode.h
+++ b/xdelta3/xdelta3-decode.h
@@ -97,6 +97,15 @@ xd3_decode_setup_buffers (xd3_stream *stream)
   /* If VCD_TARGET is set then the previous buffer may be reused. */
   if (stream->dec_win_ind & VCD_TARGET)
     {
+      /* Note: this implementation is untested, since Xdelta3 itself
+       * does not implement an encoder for VCD_TARGET mode. Thus, mark
+       * unimplemented until needed. */
+      if (1)
+        {
+          stream->msg = "VCD_TARGET not implemented";
+          return XD3_UNIMPLEMENTED;
+        }
+
       /* But this implementation only supports copying from the last
        * target window.  If the offset is outside that range, it can't
        * be done. */
@@ -116,7 +125,7 @@ xd3_decode_setup_buffers (xd3_stream *stream)
           stream->space_out = 0;
         }
 
-      // TODO: VCD_TARGET mode, this is broken
+      /* TODO: (See note above, this looks incorrect) */
       stream->dec_cpyaddrbase = stream->dec_lastwin +
         (usize_t) (stream->dec_cpyoff - stream->dec_laststart);
     }
@@ -389,6 +398,13 @@ xd3_decode_output_halfinst (xd3_stream *stream, xd3_hinst *inst)
    * supplies the data */
   usize_t take = inst->size;
 
+  if (USIZE_T_OVERFLOW (stream->avail_out, take) ||
+      stream->avail_out + take > stream->space_out)
+    {
+      stream->msg = "overflow while decoding";
+      return XD3_INVALID_INPUT;
+    }
+
   XD3_ASSERT (inst->type != XD3_NOOP);
 
   switch (inst->type)
@@ -460,7 +476,8 @@ xd3_decode_output_halfinst (xd3_stream *stream, xd3_hinst *inst)
               {
                 /* TODO: Users have requested long-distance copies of
                  * similar material within a target (e.g., for dup
-                 * supression in backups). */
+                 * supression in backups). This code path is probably
+                 * dead due to XD3_UNIMPLEMENTED in xd3_decode_setup_buffers */
                 inst->size = 0;
                 inst->type = XD3_NOOP;
                 stream->msg = "VCD_TARGET not implemented";
@@ -616,10 +633,23 @@ xd3_decode_sections (xd3_stream *stream)
       return xd3_decode_finish_window (stream);
     }
 
-  /* To avoid copying, need this much data available */
-  need = (stream->inst_sect.size +
-          stream->addr_sect.size +
-          stream->data_sect.size);
+  /* To avoid extra copying, allocate three sections at once (but
+   * check for overflow). */
+  need = stream->inst_sect.size;
+
+  if (USIZE_T_OVERFLOW (need, stream->addr_sect.size))
+    {
+      stream->msg = "decoder section size overflow";
+      return XD3_INTERNAL;
+    }
+  need += stream->addr_sect.size;
+
+  if (USIZE_T_OVERFLOW (need, stream->data_sect.size))
+    {
+      stream->msg = "decoder section size overflow";
+      return XD3_INTERNAL;
+    }
+  need += stream->data_sect.size;
 
   /* The window may be entirely processed. */
   XD3_ASSERT (stream->dec_winbytes <= need);
@@ -887,6 +917,7 @@ xd3_decode_input (xd3_stream *stream)
 
       if ((stream->dec_hdr_ind & VCD_CODETABLE) != 0)
         {
+          stream->msg = "VCD_CODETABLE support was removed";
           return XD3_UNIMPLEMENTED;
         }
       else
@@ -911,7 +942,13 @@ xd3_decode_input (xd3_stream *stream)
       if (stream->dec_hdr_ind & VCD_APPHEADER)
         {
           /* Note: we add an additional byte for padding, to allow
-             0-termination. */
+             0-termination. Check for overflow: */
+          if (USIZE_T_OVERFLOW(stream->dec_appheadsz, 1))
+            {
+              stream->msg = "exceptional appheader size";
+              return XD3_INVALID_INPUT;
+            }
+
           if ((stream->dec_appheader == NULL) &&
               (stream->dec_appheader =
                (uint8_t*) xd3_alloc (stream,
diff --git a/xdelta3/xdelta3-internal.h b/xdelta3/xdelta3-internal.h
index e3568e8..6482721 100644
--- a/xdelta3/xdelta3-internal.h
+++ b/xdelta3/xdelta3-internal.h
@@ -230,7 +230,7 @@ void xprintf(const char *fmt, ...) PRINTF_ATTRIBUTE(1,2);
                                                                        \
   do                                                                   \
     {                                                                  \
-      if (inp == max)                                                  \
+      if (inp == maxp)                                                 \
         {                                                              \
           stream->msg = "end-of-input in read_integer";                \
           return XD3_INVALID_INPUT;                                    \
@@ -290,7 +290,7 @@ xd3_decode_uint32_t (xd3_stream *stream, uint32_t *val)
 
 static inline int
 xd3_read_uint32_t (xd3_stream *stream, const uint8_t **inpp,
-                   const uint8_t *max, uint32_t *valp)
+                   const uint8_t *maxp, uint32_t *valp)
 { READ_INTEGER_TYPE (uint32_t, UINT32_OFLOW_MASK); }
 
 #if XD3_ENCODER
@@ -323,7 +323,7 @@ xd3_decode_uint64_t (xd3_stream *stream, uint64_t *val)
 
 static int
 xd3_read_uint64_t (xd3_stream *stream, const uint8_t **inpp,
-                   const uint8_t *max, uint64_t *valp)
+                   const uint8_t *maxp, uint64_t *valp)
 { READ_INTEGER_TYPE (uint64_t, UINT64_OFLOW_MASK); }
 
 #if XD3_ENCODER
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index c3cc4aa..cfc952c 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -234,7 +234,7 @@ static int         option_verbose            = DEFAULT_VERBOSE;
 static int         option_quiet              = 0;
 static int         option_use_appheader      = 1;
 static uint8_t*    option_appheader          = NULL;
-static int         option_use_secondary      = 0;
+static int         option_use_secondary      = 1;
 static const char* option_secondary          = NULL;
 static int         option_use_checksum       = 1;
 static const char* option_smatch_config      = NULL;
@@ -348,7 +348,7 @@ static int
 main_version (void)
 {
   /* $Format: "  XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, Joshua MacDonald\\n\");" $ */
-  XPR(NTR "Xdelta version 3.0.10, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Joshua MacDonald\n");
+  XPR(NTR "Xdelta version 3.0.11, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Joshua MacDonald\n");
   XPR(NTR "Xdelta comes with ABSOLUTELY NO WARRANTY.\n");
   XPR(NTR "This is free software, and you are welcome to redistribute it\n");
   XPR(NTR "under certain conditions; see \"COPYING\" for details.\n");
@@ -402,7 +402,7 @@ reset_defaults(void)
   option_verbose = DEFAULT_VERBOSE;
   option_quiet = 0;
   option_appheader = NULL;
-  option_use_secondary = 0;
+  option_use_secondary = 1;
   option_secondary = NULL;
   option_smatch_config = NULL;
   option_no_compress = 0;
@@ -1169,70 +1169,72 @@ static int
 main_set_secondary_flags (xd3_config *config)
 {
   int ret;
-  if (option_use_secondary)
+  if (!option_use_secondary)
     {
-      /* The default secondary compressor is DJW, if it's compiled. */
-      if (option_secondary == NULL)
+      return 0;
+    }
+  if (option_secondary == NULL)
+    {
+      /* Set a default secondary compressor if LZMA is built in, otherwise
+       * default to no secondary compressor. */
+      if (SECONDARY_LZMA)
         {
-          if (SECONDARY_DJW)
-            {
-              config->flags |= XD3_SEC_DJW;
-            }
+          config->flags |= XD3_SEC_LZMA;
         }
-      else
+    }
+  else
+    {
+      if (strcmp (option_secondary, "lzma") == 0 && SECONDARY_LZMA)
         {
-          if (strcmp (option_secondary, "fgk") == 0 && SECONDARY_FGK)
-            {
-              config->flags |= XD3_SEC_FGK;
-            }
-          else if (strcmp (option_secondary, "lzma") == 0 && SECONDARY_LZMA)
+          config->flags |= XD3_SEC_LZMA;
+        }
+      else if (strcmp (option_secondary, "fgk") == 0 && SECONDARY_FGK)
+        {
+          config->flags |= XD3_SEC_FGK;
+        }
+      else if (strncmp (option_secondary, "djw", 3) == 0 && SECONDARY_DJW)
+        {
+          usize_t level = XD3_DEFAULT_SECONDARY_LEVEL;
+
+          config->flags |= XD3_SEC_DJW;
+
+          if (strlen (option_secondary) > 3 &&
+              (ret = main_atou (option_secondary + 3,
+                                &level,
+                                0, 9, 'S')) != 0 &&
+              !option_quiet)
             {
-              config->flags |= XD3_SEC_LZMA;
+              return XD3_INVALID;
             }
-          else if (strncmp (option_secondary, "djw", 3) == 0 && SECONDARY_DJW)
-            {
-              usize_t level = XD3_DEFAULT_SECONDARY_LEVEL;
 
-              config->flags |= XD3_SEC_DJW;
+          /* XD3_SEC_NOXXXX flags disable secondary compression on
+           * a per-section basis.  For djw, ngroups=1 indicates
+           * minimum work, ngroups=0 uses default settings, which
+           * is > 1 groups by default. */
+          if (level < 1) { config->flags |= XD3_SEC_NODATA; }
+          if (level < 7) { config->sec_data.ngroups = 1; }
+          else { config->sec_data.ngroups = 0; }
 
-              if (strlen (option_secondary) > 3 &&
-                  (ret = main_atou (option_secondary + 3,
-                                    &level,
-                                    0, 9, 'S')) != 0 &&
-                  !option_quiet)
-                {
-                  return XD3_INVALID;
-                }
+          if (level < 3) { config->flags |= XD3_SEC_NOINST; }
+          if (level < 8) { config->sec_inst.ngroups = 1; }
+          else { config->sec_inst.ngroups = 0; }
 
-              /* XD3_SEC_NOXXXX flags disable secondary compression on
-               * a per-section basis.  For djw, ngroups=1 indicates
-               * minimum work, ngroups=0 uses default settings, which
-               * is > 1 groups by default. */
-              if (level < 1) { config->flags |= XD3_SEC_NODATA; }
-              if (level < 7) { config->sec_data.ngroups = 1; }
-              else { config->sec_data.ngroups = 0; }
-
-              if (level < 3) { config->flags |= XD3_SEC_NOINST; }
-              if (level < 8) { config->sec_inst.ngroups = 1; }
-              else { config->sec_inst.ngroups = 0; }
-
-              if (level < 5) { config->flags |= XD3_SEC_NOADDR; }
-              if (level < 9) { config->sec_addr.ngroups = 1; }
-              else { config->sec_addr.ngroups = 0; }
-            }
-          else if (strcmp (option_secondary, "none") == 0 && SECONDARY_DJW)
-            {
-              /* No secondary */
-            }
-          else
+          if (level < 5) { config->flags |= XD3_SEC_NOADDR; }
+          if (level < 9) { config->sec_addr.ngroups = 1; }
+          else { config->sec_addr.ngroups = 0; }
+        }
+      else if (*option_secondary == 0 ||
+               strcmp (option_secondary, "none") == 0)
+        {
+        }
+      else 
+        {
+          if (!option_quiet)
             {
-              if (!option_quiet)
-                {
-                  XPR(NT "unrecognized secondary compressor type: %s\n",
-                      option_secondary);
-                  return XD3_INVALID;
-                }
+              XPR(NT "unrecognized or not compiled secondary compressor: %s\n",
+                  option_secondary);
             }
+          return XD3_INVALID;
         }
     }
 
@@ -2418,7 +2420,7 @@ main_secondary_decompress_check (main_file  *file,
   usize_t i;
   usize_t try_read = xd3_min (input_size, XD3_ALLOCSIZE);
   size_t  check_nread = 0;
-  uint8_t check_buf[XD3_ALLOCSIZE];  /* TODO: stack limit */
+  uint8_t check_buf[XD3_ALLOCSIZE];  /* TODO: heap allocate */
   const main_extcomp *decompressor = NULL;
 
   if ((ret = main_file_read (file, check_buf,
@@ -3354,7 +3356,8 @@ main_input (xd3_cmd     cmd,
         default:
           /* input_func() error */
           XPR(NT XD3_LIB_ERRMSG (& stream, ret));
-          if (! option_quiet && ret == XD3_INVALID_INPUT)
+          if (! option_quiet && ret == XD3_INVALID_INPUT &&
+              sfile != NULL && sfile->filename != NULL)
             {
               XPR(NT "normally this indicates that the source file is incorrect\n");
               XPR(NT "please verify the source file with sha1sum or equivalent\n");
@@ -3759,8 +3762,8 @@ int main (int argc, char **argv)
         case 'J': option_no_output = 1; break;
         case 'S': if (my_optarg == NULL)
             {
-              option_use_secondary = 1;
-              option_secondary = "none";
+              option_use_secondary = 0;
+              option_secondary = NULL;
             }
           else
             {
diff --git a/xdelta3/xdelta3-second.h b/xdelta3/xdelta3-second.h
index 098a5d5..309c947 100644
--- a/xdelta3/xdelta3-second.h
+++ b/xdelta3/xdelta3-second.h
@@ -140,6 +140,12 @@ xd3_decode_secondary (xd3_stream      *stream,
       return ret;
     }
 
+  if (dec_size == 0)
+    {
+      stream->msg = "secondary decoder invalid output size";
+      return XD3_INVALID_INPUT;
+    }
+
   out_used = sect->copied2;
 
   if ((ret = stream->sec_type->decode (stream, *sec_streamp,
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h
index d7cb48e..ddbfd65 100644
--- a/xdelta3/xdelta3-test.h
+++ b/xdelta3/xdelta3-test.h
@@ -236,7 +236,8 @@ static void
 test_unlink (char* file)
 {
   int ret;
-  if ((ret = unlink (file)) != 0 && errno != ENOENT)
+  if (file != NULL && *file != 0 &&
+      (ret = unlink (file)) != 0 && errno != ENOENT)
     {
       XPR(NT "unlink %s failed: %s\n", file, strerror(ret));
     }
@@ -261,6 +262,9 @@ int test_setup (void)
   static int x = 0;
   pid_t pid = getpid();
   x++;
+
+  test_cleanup();
+
   snprintf_func (TEST_TARGET_FILE, TESTFILESIZE,
                  "/tmp/xdtest.%d.target.%d", pid, x);
   snprintf_func (TEST_SOURCE_FILE, TESTFILESIZE,
@@ -275,6 +279,7 @@ int test_setup (void)
                  "/tmp/xdtest.%d.copy.%d", pid, x);
   snprintf_func (TEST_NOPERM_FILE, TESTFILESIZE,
                  "/tmp/xdtest.%d.noperm.%d", pid, x);
+
   test_cleanup();
   return 0;
 }
@@ -1516,7 +1521,8 @@ IF_DJW (static int test_secondary_huff (xd3_stream *stream, usize_t gp)
         { return test_secondary (stream, & djw_sec_type, gp); })
 IF_LZMA (static int test_secondary_lzma (xd3_stream *stream, usize_t gp)
         { return test_secondary (stream, & lzma_sec_type, gp); })
-#endif
+
+#endif  /* SECONDARY_ANY */
 
 /***********************************************************************
  TEST INSTRUCTION TABLE
@@ -1952,7 +1958,7 @@ test_recode_command2 (xd3_stream *stream, int has_source,
             recoded_adler32 ? "" : "-n ",
             !change_apphead ? "" :
                 (recoded_apphead ? "-A=recode_apphead " : "-A= "),
-            recoded_secondary ? "-S djw " : "-S none ",
+            recoded_secondary ? "-S djw " : "-S= ",
             TEST_DELTA_FILE,
             TEST_COPY_FILE);
 
@@ -2048,6 +2054,7 @@ test_recode_command2 (xd3_stream *stream, int has_source,
     {
       return ret;
     }
+  test_cleanup ();
 
   return 0;
 }
@@ -2086,7 +2093,46 @@ test_recode_command (xd3_stream *stream, int ignore)
 
   return 0;
 }
-#endif
+
+#if SECONDARY_LZMA
+int test_secondary_lzma_default (xd3_stream *stream, int ignore)
+{
+  char ecmd[TESTBUFSIZE];
+  int ret;
+
+  test_setup ();
+
+  if ((ret = test_make_inputs (stream, NULL, NULL)))
+    {
+      return ret;
+    }
+
+  /* First encode */
+  snprintf_func (ecmd, TESTBUFSIZE, "%s -e %s %s",
+                 program_name,
+                 TEST_TARGET_FILE,
+                 TEST_DELTA_FILE);
+
+  if ((ret = system (ecmd)) != 0)
+    {
+      return XD3_INTERNAL;
+    }
+
+  if ((ret = check_vcdiff_header (stream,
+                                  TEST_DELTA_FILE,
+                                  "VCDIFF secondary compressor",
+                                  "lzma",
+                                  1)))
+    {
+      return ret;
+    }
+
+  test_cleanup ();
+  return 0;
+}
+
+#endif  /* SECONDARY_LZMA */
+#endif  /* SHELL_TESTS */
 
 /***********************************************************************
  EXTERNAL I/O DECOMPRESSION/RECOMPRESSION
@@ -2468,6 +2514,7 @@ test_appheader (xd3_stream *stream, int ignore)
       return XD3_INVALID;  // Must have crashed!
     }
 
+  test_cleanup ();
   return 0;
 }
 
@@ -2964,6 +3011,7 @@ int xd3_selftest (void)
   DO_TEST (recode_command, 0, 0);
 #endif
 
+  IF_LZMA (DO_TEST (secondary_lzma_default, 0, 0));
   IF_LZMA (DO_TEST (secondary_lzma, 0, 1));
   IF_DJW (DO_TEST (secondary_huff, 0, DJW_MAX_GROUPS));
   IF_FGK (DO_TEST (secondary_fgk, 0, 1));
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 874b35a..d95d97d 100644
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -1598,8 +1598,11 @@ xd3_free_stream (xd3_stream *stream)
   xd3_free (stream, stream->addr_sect.copied1);
   xd3_free (stream, stream->data_sect.copied1);
 
+  if (stream->dec_lastwin != stream->dec_buffer)
+    {
+      xd3_free (stream, (uint8_t*) stream->dec_lastwin);
+    }
   xd3_free (stream, stream->dec_buffer);
-  xd3_free (stream, (uint8_t*) stream->dec_lastwin);
 
   xd3_free (stream, stream->buf_in);
   xd3_free (stream, stream->dec_appheader);
diff --git a/xdelta3/xdelta3.prj b/xdelta3/xdelta3.prj
deleted file mode 100644
index 96c3a8c..0000000
--- a/xdelta3/xdelta3.prj
+++ /dev/null
@@ -1,61 +0,0 @@
-;; -*- Prcs -*-
-(Created-By-Prcs-Version 1 3 4)
-(Project-Description "")
-(Project-Version xdelta3 0 35)
-(Parent-Version xdelta3 0 34)
-(Version-Log "3.0r Removes NODECOMPRESSIZE")
-(New-Version-Log "")
-(Checkin-Time "Wed, 10 Oct 2007 02:27:56 -0700")
-(Checkin-Login jmacd)
-(Populate-Ignore ("\\.svn"))
-(Project-Keywords
- (Xdelta3Version "3.0.10")
- )
-(Files
-  (COPYING (xdelta3/b/29_COPYING 1.1 744))
-
-  (xdelta3-cfgs.h (xdelta3/9_xdelta3-cf 1.8 744))
-  (xdelta3-decode.h (xdelta3/b/30_xdelta3-de 1.7 744))
-  (xdelta3-djw.h (xdelta3/8_xdelta3-dj 1.8 744))
-  (xdelta3-fgk.h (xdelta3/7_xdelta3-fg 1.4 744))
-  (xdelta3-list.h (xdelta3/6_xdelta3-li 1.3 744))
-  (xdelta3-main.h (xdelta3/5_xdelta3-ma 1.21 744))
-  (xdelta3-python.h (xdelta3/4_xdelta3-py 1.5 744))
-  (xdelta3-regtest.py (xdelta3/10_xdelta3-re 1.20 744))
-  (xdelta3-second.h (xdelta3/3_xdelta3-se 1.6 744))
-  (xdelta3-test.h (xdelta3/2_xdelta3-te 1.16 744))
-  (xdelta3.c (xdelta3/16_xdelta3.c 1.19 744))
-  (xdelta3.h (xdelta3/1_xdelta3.h 1.17 744))
-
-  (Makefile (xdelta3/0_Makefile 1.13 744))
-  (setup.py (xdelta3/11_setup.py 1.5 744))
-
-  (draft-korn-vcdiff.txt (xdelta3/b/22_draft-korn 1.1 744))
-
-  (badcopy.c (xdelta3/20_badcopy.c 1.2 744))
-  (linkxd3lib.c (xdelta3/19_linkxd3lib 1.3 744))
-  (rcs_junk.cc (xdelta3/15_rcs_junk.c 1.1 744))
-
-  (README (xdelta3/b/31_README 1.1 744))
-  (badcopy.vcproj (xdelta3/b/32_badcopy.vc 1.1 744))
-  (xdelta3.vcproj (xdelta3/b/33_xdelta3.vc 1.4 744))
-
-  (xdelta3.swig (xdelta3/b/27_xdelta3.sw 1.3 744))
-
-  (xdelta3-test.py (xdelta3/b/28_xdelta3-te 1.5 744))
-
-  (examples/Makefile (xdelta3/b/34_Makefile 1.2 744))
-  (examples/small_page_test.c (xdelta3/b/35_small_page 1.2 744))
-
-  (plot.sh (xdelta3/b/36_plot.sh 1.1 744))
-
-  (xdelta3.wxs (xdelta3/b/37_xdelta3.wx 1.1 744))
-  (xdelta3.wxi (xdelta3/b/38_xdelta3.wx 1.1 744))
-
-;; Files added by populate at Wed, 10 Oct 2007 02:15:48 -0700,
-;; to version 0.33(w), by jmacd:
-
-  (examples/encode_decode_test.c (xdelta3/b/39_encode_dec 1.1 744))
-)
-(Merge-Parents)
-(New-Merge-Parents)