Merge command passes its first smoke test, reproduces a delta by

instruction-level rewriting of the input to the output.  Hits an
assertion due to target-copies that cross window boundaries--next
step is to fix the output window size to the last input window size.

This fixes an important bug in xd3_choose_instruction, which assumed
that copy instructions were at least four bytes, but this is no longer
the case for merged outputs (at least for the case where window size
changes, which will not be allowed in future).

1 files changed, 10 insertions, 2 deletions

diff --git a/xdelta3/xdelta3-merge.h b/xdelta3/xdelta3-merge.h
index 217e3ec..7d32b22 100644
--- a/xdelta3/xdelta3-merge.h
+++ b/xdelta3/xdelta3-merge.h
@@ -93,7 +93,7 @@ xd3_whole_append_inst (xd3_stream *stream,
 
   winst = &stream->whole_target_inst[stream->whole_target_instlen++];
   winst->type = inst->type;
-  winst->mode = SRCORTGT (stream->dec_win_ind);
+  winst->mode = 0;
   winst->size = inst->size;
 
   switch (inst->type)
@@ -114,7 +114,15 @@ xd3_whole_append_inst (xd3_stream *stream,
       break;
 
     default:
-      winst->addr = stream->dec_cpyoff + inst->addr;
+      if (inst->addr < stream->dec_cpylen)
+        {
+          winst->mode = SRCORTGT (stream->dec_win_ind);
+          winst->addr = stream->dec_cpyoff + inst->addr;
+        }
+      else
+        {
+          winst->addr = stream->total_out + inst->addr - stream->dec_cpylen;
+        }
       break;
     }