Win32 apply

[wimlib] / src / xpress-decompress.c

diff --git a/src/xpress-decompress.c b/src/xpress-decompress.c
index f2a0603370ec94f68a2386e051f1d2052c879351..6570e725baeb0554ce299139717eb19674c62d0d 100644 (file)
--- a/src/xpress-decompress.c
+++ b/src/xpress-decompress.c
@@ -6,7 +6,7 @@
 
 /*
  *
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -126,8 +126,6 @@ static int xpress_decode_match(unsigned huffsym, unsigned window_pos,
                                return ret;
 
                        match_len |= (ret << 8);
-                       if (match_len < 0xf)
-                               return -1;
                } else {
                        match_len += 0xf;
                }
@@ -144,15 +142,15 @@ static int xpress_decode_match(unsigned huffsym, unsigned window_pos,
        match_src = match_dest - match_offset;
 
        if (window_pos + match_len > window_len) {
-               ERROR("XPRESS decompression error: match of length %d "
+               ERROR("XPRESS decompression error: match of length %u "
                      "bytes overflows window", match_len);
                return -1;
        }
 
        if (match_src < window) {
-               ERROR("XPRESS decompression error: match of length %d bytes "
-                     "references data before window (match_offset = %d, "
-                     "window_pos = %d)", match_len, match_offset, window_pos);
+               ERROR("XPRESS decompression error: match of length %u bytes "
+                     "references data before window (match_offset = %u, "
+                     "window_pos = %u)", match_len, match_offset, window_pos);
                return -1;
        }