lzx-decompress.c: Inline and optimize lzx_decode_match()

[wimlib] / src / decompress.c

diff --git a/src/decompress.c b/src/decompress.c
index 3e110e84d7a9bfea65de133d3e0deffe9cc53ae3..b8ed8dfcfe03186b33a119c4069e31d2709f5bca 100644 (file)
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -34,6 +34,7 @@
 
 struct wimlib_decompressor {
        const struct decompressor_ops *ops;
+       size_t max_block_size;
        void *private;
 };
 
@@ -58,16 +59,20 @@ wimlib_create_decompressor(enum wimlib_compression_type ctype,
 {
        struct wimlib_decompressor *dec;
 
+       if (!decompressor_ctype_valid(ctype))
+               return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
+
        if (dec_ret == NULL)
                return WIMLIB_ERR_INVALID_PARAM;
 
-       if (!decompressor_ctype_valid(ctype))
-               return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
+       if (max_block_size == 0)
+               return WIMLIB_ERR_INVALID_PARAM;
 
        dec = MALLOC(sizeof(*dec));
        if (dec == NULL)
                return WIMLIB_ERR_NOMEM;
        dec->ops = decompressor_ops[ctype];
+       dec->max_block_size = max_block_size;
        dec->private = NULL;
        if (dec->ops->create_decompressor) {
                int ret;
@@ -88,6 +93,9 @@ wimlib_decompress(const void *compressed_data, size_t compressed_size,
                  void *uncompressed_data, size_t uncompressed_size,
                  struct wimlib_decompressor *dec)
 {
+       if (unlikely(uncompressed_size > dec->max_block_size))
+               return -2;
+
        return dec->ops->decompress(compressed_data, compressed_size,
                                    uncompressed_data, uncompressed_size,
                                    dec->private);