5 files changed, 21 insertions, 21 deletions

diff --git a/xdelta3/Makefile.am b/xdelta3/Makefile.am
index 6fe2b74..7d00a9b 100644
--- a/xdelta3/Makefile.am
+++ b/xdelta3/Makefile.am
@@ -4,7 +4,6 @@ bin_PROGRAMS = xdelta3
 noinst_PROGRAMS = xdelta3regtest xdelta3decode
 
 export AFL_HARDEN
-export AFL_USE_ASAN
 
 common_SOURCES = \
           xdelta3-blkcache.h \
diff --git a/xdelta3/configure.ac b/xdelta3/configure.ac
index c3a0b3d..ce24045 100644
--- a/xdelta3/configure.ac
+++ b/xdelta3/configure.ac
@@ -5,9 +5,6 @@ AC_CONFIG_MACRO_DIR([m4])
 LT_INIT
 AM_INIT_AUTOMAKE([1.9 no-define foreign tar-ustar subdir-objects])
 
-AC_ARG_VAR(AFL_HARDEN, "Use hardened AFL")
-AC_ARG_VAR(AFL_USE_ASAN, "Use ASAN with AFL")
-
 AX_CHECK_ALIGNED_ACCESS_REQUIRED
 AC_PROG_CC
 AC_PROG_CXX
diff --git a/xdelta3/run_release.sh b/xdelta3/run_release.sh
index 4b45124..c4eb802 100755
--- a/xdelta3/run_release.sh
+++ b/xdelta3/run_release.sh
@@ -107,19 +107,12 @@ function buildit {
     local BM="${host}${march}"
     local USECC="${CC}"
     local USECXX="${CXX}"
-    local ASAN="0"
     local LIBBM="${BM}"
 
     if [ "${afl}" = "1" ]; then
         USECC="afl-gcc"
         USECXX="afl-g++"
         BM="${BM}-afl"
-
-        if [ "${march}" = "-m32" ]; then
-            ASAN="1"
-            BM="${BM}-asan"
-            cargs="${cargs} -fno-omit-frame-pointer -fsanitize=address"
-        fi
     fi
 
     local D="build/${BM}/xoff${offsetbits}"
@@ -185,9 +178,7 @@ EOF
                   "CXXFLAGS=${CXXFLAGS}" \
                   "LDFLAGS=${LDFLAGS}" \
                   "CC=${USECC}" \
-                  "CXX=${USECXX}" \
-                  "AFL_HARDEN=${afl}" \
-                  "AFL_USE_ASAN=${ASAN}"
+                  "CXX=${USECXX}"
     if [ $? -ne 0 ]; then
         return
     fi
diff --git a/xdelta3/xdelta3-decode.h b/xdelta3/xdelta3-decode.h
index 19bf208..6ec200f 100644
--- a/xdelta3/xdelta3-decode.h
+++ b/xdelta3/xdelta3-decode.h
@@ -625,10 +625,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);
diff --git a/xdelta3/xdelta3-internal.h b/xdelta3/xdelta3-internal.h
index 244192c..d6eb0ac 100644
--- a/xdelta3/xdelta3-internal.h
+++ b/xdelta3/xdelta3-internal.h
@@ -221,7 +221,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;                                    \
@@ -281,7 +281,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
@@ -306,7 +306,7 @@ xd3_emit_uint64_t (xd3_stream *stream, xd3_output **output, uint64_t num)
 #if REGRESSION_TEST
 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); }
 
 static uint32_t