Fixes:

1. Encoder was improperly setting stream->min_match on re-entry following
XD3_GETSRCBLK events.

2. Decoder was improperly terminating a loop when XD3_GETSRCBLK events 
occur while decoding the final instruction.

3. An known assertion failure in djw_compute_mtf_1_2 will abort() in
non-debug mode instead of running out of memory.

1 files changed, 3 insertions, 0 deletions

diff --git a/xdelta3/xdelta3-djw.h b/xdelta3/xdelta3-djw.h
index 19f7ca0..dc3e70b 100644
--- a/xdelta3/xdelta3-djw.h
+++ b/xdelta3/xdelta3-djw.h
@@ -537,6 +537,9 @@ djw_compute_mtf_1_2 (djw_prefix *prefix,
       for (j = 0; mtf[j] != sym; j += 1) { }
 
       XD3_ASSERT (j < nsym);
+      /* TODO: A reported test case triggers this assertion in debug and
+       * crashes (out of memory) in non-debug mode. Catch it here until fixed: */
+      if (j >= nsym) { abort(); }
 
       for (k = j; k >= 1; k -= 1) { mtf[k] = mtf[k-1]; }