A few cleanups and fixes from recent changes

diff --git a/src/lcpit_matchfinder.c b/src/lcpit_matchfinder.c
index 9d22ad076e6bc900a99fb2739fcaf275651527a5..b8144559147dcf78a8fe84a26c112edc6b8307b1 100644 (file)
--- a/src/lcpit_matchfinder.c
+++ b/src/lcpit_matchfinder.c
@@ -11,6 +11,10 @@
  * You can do whatever you want with this file.
  */
 
  * You can do whatever you want with this file.
  */
 

+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+

 #include <limits.h>
 
 #include "wimlib/divsufsort.h"
 #include <limits.h>
 
 #include "wimlib/divsufsort.h"


@@ -37,7 +41,7 @@
  * Build the LCP (Longest Common Prefix) array in linear time.
  *
  * LCP[r] will be the length of the longest common prefix between the suffixes
  * Build the LCP (Longest Common Prefix) array in linear time.
  *
  * LCP[r] will be the length of the longest common prefix between the suffixes

- * with positions SA[r - 1] and  SA[r].  LCP[0] will be undefined.
+ * with positions SA[r - 1] and SA[r].  LCP[0] will be undefined.

  *
  * Algorithm taken from Kasai et al. (2001), but modified slightly:
  *
  *
  * Algorithm taken from Kasai et al. (2001), but modified slightly:
  *


@@ -219,11 +223,11 @@ build_LCPIT(u32 intervals[restrict], u32 pos_data[restrict], const u32 n)
  * 'cur_pos' is the position of the current suffix, which is the suffix being
  * matched against.  'cur_pos' starts at 0 and is incremented each time this
  * function is called.  This function finds each suffix with position less than
  * 'cur_pos' is the position of the current suffix, which is the suffix being
  * matched against.  'cur_pos' starts at 0 and is incremented each time this
  * function is called.  This function finds each suffix with position less than

- * 'cur_pos' that shares a prefix with the current position, but for each
- * distinct prefix length it finds only the suffix with the greatest position
- * (i.e. the most recently seen in the linear traversal by position).  This
- * function accomplishes this using the lcp-interval tree data structure that
- * was built by build_LCPIT() and is updated dynamically by this function.
+ * 'cur_pos' that shares a prefix with the current suffix, but for each distinct
+ * prefix length it finds only the suffix with the greatest position (i.e. the
+ * most recently seen in the linear traversal by position).  This function
+ * accomplishes this using the lcp-interval tree data structure that was built
+ * by build_LCPIT() and is updated dynamically by this function.

  *
  * The first step is to read 'pos_data[cur_pos]', which gives the index and lcp
  * value of the deepest lcp-interval containing the current suffix --- or,
  *
  * The first step is to read 'pos_data[cur_pos]', which gives the index and lcp
  * value of the deepest lcp-interval containing the current suffix --- or,


@@ -334,13 +338,13 @@ lcpit_advance_one_byte(const u32 cur_pos,
 
 /* Expand SA from 32 bits to 64 bits.  */
 static void
 
 /* Expand SA from 32 bits to 64 bits.  */
 static void

-expand_SA(u32 *p, u32 n)
+expand_SA(void *p, u32 n)

 {
        typedef u32 _may_alias_attribute aliased_u32_t;
        typedef u64 _may_alias_attribute aliased_u64_t;
 
 {
        typedef u32 _may_alias_attribute aliased_u32_t;
        typedef u64 _may_alias_attribute aliased_u64_t;
 

-       aliased_u32_t *SA = (aliased_u32_t *)p;
-       aliased_u64_t *SA64 = (aliased_u64_t *)p;
+       aliased_u32_t *SA = p;
+       aliased_u64_t *SA64 = p;

 
        u32 r = n - 1;
        do {
 
        u32 r = n - 1;
        do {


@@ -596,11 +600,10 @@ lcpit_matchfinder_init(struct lcpit_matchfinder *mf, size_t max_bufsize,
 static void
 build_SA(u32 SA[], const u8 T[], u32 n, u32 *tmp)
 {
 static void
 build_SA(u32 SA[], const u8 T[], u32 n, u32 *tmp)
 {

-       /* Note: divsufsort() needs temporary space --- one array with 256
-        * spaces and one array with 65536 spaces.  The implementation of
-        * divsufsort() has been modified from the original to use the provided
-        * temporary space instead of allocating its own, since we don't want to
-        * have to deal with malloc() failures here.  */
+       /* Note: divsufsort() requires a fixed amount of temporary space.  The
+        * implementation of divsufsort() has been modified from the original to
+        * use the provided temporary space instead of allocating its own, since
+        * we don't want to have to deal with malloc() failures here.  */

        divsufsort(T, SA, n, tmp);
 }
 
        divsufsort(T, SA, n, tmp);
 }
 

diff --git a/src/lzms_compress.c b/src/lzms_compress.c
index caa93130c75ca44f656a1d8464621985d6eb3bd1..8db49668d296bf8d0340235ae78a4bc78aa372cf 100644 (file)
--- a/src/lzms_compress.c
+++ b/src/lzms_compress.c
@@ -307,7 +307,8 @@ struct lzms_compressor {
        u32 next_delta_hashes[NUM_POWERS_TO_CONSIDER];
 
        /* The per-byte graph nodes for near-optimal parsing  */
        u32 next_delta_hashes[NUM_POWERS_TO_CONSIDER];
 
        /* The per-byte graph nodes for near-optimal parsing  */

-       struct lzms_optimum_node optimum_nodes[NUM_OPTIM_NODES + MAX_FAST_LENGTH];
+       struct lzms_optimum_node optimum_nodes[NUM_OPTIM_NODES + MAX_FAST_LENGTH +
+                                              1 + MAX_FAST_LENGTH];

 
        /* Table: length => current cost for small match lengths  */
        u32 fast_length_cost_tab[MAX_FAST_LENGTH + 1];
 
        /* Table: length => current cost for small match lengths  */
        u32 fast_length_cost_tab[MAX_FAST_LENGTH + 1];


@@ -946,7 +947,7 @@ lzms_encode_item_list(struct lzms_compressor *c,
 }
 
 /******************************************************************************
 }
 
 /******************************************************************************

- *                             Cost evalution                                 *
+ *                             Cost evaluation                                *

  ******************************************************************************/
 
 /*
  ******************************************************************************/
 
 /*


@@ -1764,6 +1765,11 @@ begin:
                                                                        span);
 
                                const u32 raw_offset = offset >> power;
                                                                        span);
 
                                const u32 raw_offset = offset >> power;

+
+                               if (unlikely(raw_offset > DELTA_SOURCE_RAW_OFFSET_MASK -
+                                                         (LZMS_NUM_DELTA_REPS - 1)))
+                                       continue;
+

                                const u32 pair = (power << DELTA_SOURCE_POWER_SHIFT) |
                                                 raw_offset;
                                const u32 source = DELTA_SOURCE_TAG |
                                const u32 pair = (power << DELTA_SOURCE_POWER_SHIFT) |
                                                 raw_offset;
                                const u32 source = DELTA_SOURCE_TAG |