3 files changed, 16 insertions, 7 deletions

diff --git a/xdelta3/Makefile b/xdelta3/Makefile
index d6a6b5b..ef5468d 100755
--- a/xdelta3/Makefile
+++ b/xdelta3/Makefile
@@ -13,7 +13,7 @@ SOURCES = xdelta3-cfgs.h \
           xdelta3.c \
           xdelta3.h
 
-TARGETS = xdelta3 xdelta3-1 xdelta3-2 xdelta3-64 xdelta3-everything \
+TARGETS = xdelta3 xdelta3-1 xdelta3-debug xdelta3-64 xdelta3-everything \
           xdelta3-Opg xdelta3-64-O xdelta3-Op xdelta3-O \
           xdelta3-decoder xdelta3-decoder-nomain.o \
           $(PYTGT) \
@@ -32,7 +32,7 @@ EXTRA = Makefile COPYING linkxd3lib.c badcopy.c www
 REL=0h_pre0
 RELDIR = xdelta3$(REL)
 
-all: xdelta3 $(PYTGT)
+all: xdelta3 xdelta3-debug $(PYTGT)
 
 all-targets: $(TARGETS)
 
@@ -65,8 +65,8 @@ xdelta3-1: $(SOURCES)
         $(CC) -g -Wall -Wshadow xdelta3.c -o xdelta3-1 -DXD3_MAIN=1 -DGENERIC_ENCODE_TABLES=1 \
                 -DXD3_USE_LARGEFILE64=1 -DREGRESSION_TEST=1 -DXD3_DEBUG=1 -DSECONDARY_DJW=1 -lm
 
-xdelta3-2: $(SOURCES)
-        $(CC) -g -Wall -Wshadow xdelta3.c -o xdelta3-2 -DXD3_MAIN=1 -DGENERIC_ENCODE_TABLES=1 \
+xdelta3-debug: $(SOURCES)
+        $(CC) -g -Wall -Wshadow xdelta3.c -o xdelta3-debug -DXD3_MAIN=1 -DGENERIC_ENCODE_TABLES=1 \
                 -DXD3_USE_LARGEFILE64=1 -DREGRESSION_TEST=1 -DXD3_DEBUG=2 -DSECONDARY_DJW=1 -lm
 
 xdelta3-decoder: $(SOURCES)
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c
index 7e68c57..e2f4f28 100755
--- a/xdelta3/xdelta3.c
+++ b/xdelta3/xdelta3.c
@@ -3982,9 +3982,9 @@ xd3_srcwin_move_point (xd3_stream *stream, usize_t *next_move_point)
 
   /* If the stream has matched beyond the srcwin_cksum_pos (good), we shouldn't
    * begin reading so far back. */
-  if (stream->match_maxaddr > stream->srcwin_cksum_pos)
+  if (stream->maxsrcaddr > stream->srcwin_cksum_pos)
     {
-      stream->srcwin_cksum_pos = stream->match_maxaddr;
+      stream->srcwin_cksum_pos = stream->maxsrcaddr;
     }
 
   if (logical_input_cksum_pos < stream->srcwin_cksum_pos) 
@@ -4019,7 +4019,7 @@ xd3_srcwin_move_point (xd3_stream *stream, usize_t *next_move_point)
         {
           if (ret == XD3_TOOFARBACK)
             {
-              // TODO: this is still happening
+              // TODO: this may still be happening, or fixed by stream->srcmaxaddr?
               ret = XD3_INTERNAL;
             }
           return ret;
@@ -4399,9 +4399,16 @@ xd3_source_extend_match (xd3_stream *stream)
 
       if (match_end > stream->match_maxaddr)
         {
+          // Note: per-window
           stream->match_maxaddr = match_end;
         }
 
+      if (match_end > stream->maxsrcaddr)
+        {
+          // Note: across windows
+          stream->maxsrcaddr = match_end;
+        }
+
       IF_DEBUG1 ({
         static int x = 0;
         P(RINT "[source match:%d] <inp %"Q"u %"Q"u>  <src %"Q"u %"Q"u> (%s) [ %u bytes ]\n",
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 0f11854..71fe681 100755
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -689,6 +689,8 @@ struct _xd3_stream
   usize_t            match_fwd;        /* match extends forward so far */
   usize_t            match_maxfwd;     /* match extends forward maximum */
 
+  xoff_t             maxsrcaddr;      /* address of the last source match (across windows) */
+
   uint8_t          *buf_in;           /* for saving buffered input */
   usize_t            buf_avail;        /* amount of saved input */
   const uint8_t    *buf_leftover;     /* leftover content of next_in (i.e., user's buffer) */