wimlib-imagex: improve error message

[wimlib] / src / decompress.c

diff --git a/src/decompress.c b/src/decompress.c
index 4ea066f0d4a86a628c70941330554d8a5c745e3e..d79865b898d19e9409f47569531aa0ef5f38454b 100644 (file)
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -6,22 +6,20 @@
  */
 
 /*
- * Copyright (C) 2013 Eric Biggers
+ * Copyright (C) 2013, 2014 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -34,22 +32,16 @@
 
 struct wimlib_decompressor {
        const struct decompressor_ops *ops;
+       size_t max_block_size;
        void *private;
 };
 
 static const struct decompressor_ops *decompressor_ops[] = {
-       [WIMLIB_COMPRESSION_TYPE_LZX]    = &lzx_decompressor_ops,
        [WIMLIB_COMPRESSION_TYPE_XPRESS] = &xpress_decompressor_ops,
+       [WIMLIB_COMPRESSION_TYPE_LZX]    = &lzx_decompressor_ops,
        [WIMLIB_COMPRESSION_TYPE_LZMS]   = &lzms_decompressor_ops,
 };
 
-static struct wimlib_decompressor_params_header *
-decompressor_default_params[ARRAY_LEN(decompressor_ops)] = {
-       [WIMLIB_COMPRESSION_TYPE_LZX]    = NULL,
-       [WIMLIB_COMPRESSION_TYPE_XPRESS] = NULL,
-       [WIMLIB_COMPRESSION_TYPE_LZMS]   = NULL,
-};
-
 static bool
 decompressor_ctype_valid(int ctype)
 {
@@ -58,65 +50,32 @@ decompressor_ctype_valid(int ctype)
                decompressor_ops[ctype] != NULL);
 }
 
-WIMLIBAPI int
-wimlib_set_default_decompressor_params(enum wimlib_compression_type ctype,
-                                      const struct wimlib_decompressor_params_header *params)
-{
-       struct wimlib_decompressor_params_header *dup;
-
-       if (!decompressor_ctype_valid(ctype))
-               return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
-
-       dup = NULL;
-       if (params) {
-               dup = memdup(params, params->size);
-               if (dup == NULL)
-                       return WIMLIB_ERR_NOMEM;
-       }
-
-       FREE(decompressor_default_params[ctype]);
-       decompressor_default_params[ctype] = dup;
-       return 0;
-}
-
-void
-cleanup_decompressor_params(void)
-{
-       for (size_t i = 0; i < ARRAY_LEN(decompressor_default_params); i++) {
-               FREE(decompressor_default_params[i]);
-               decompressor_default_params[i] = NULL;
-       }
-}
-
 WIMLIBAPI int
 wimlib_create_decompressor(enum wimlib_compression_type ctype,
                           size_t max_block_size,
-                          const struct wimlib_decompressor_params_header *extra_params,
                           struct wimlib_decompressor **dec_ret)
 {
        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) {
-               const struct wimlib_decompressor_params_header *params;
                int ret;
 
-               if (extra_params)
-                       params = extra_params;
-               else
-                       params = decompressor_default_params[ctype];
                ret = dec->ops->create_decompressor(max_block_size,
-                                                   params,
                                                    &dec->private);
                if (ret) {
                        FREE(dec);
@@ -132,6 +91,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);