X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdecompress.c;h=7d8747a8b3506f76b2d5cdfc68ebe27abba4433d;hp=3e110e84d7a9bfea65de133d3e0deffe9cc53ae3;hb=refs%2Fheads%2Fzstd_support;hpb=4dd45340f9fe3a533e0f1a9d6b79f8118e45ca2a

diff --git a/src/decompress.c b/src/decompress.c
index 3e110e84..7d8747a8 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -8,20 +8,18 @@
 /*
  * 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,13 +32,17 @@
 
 struct wimlib_decompressor {
 	const struct decompressor_ops *ops;
+	size_t max_block_size;
 	void *private;
 };
 
-static const struct decompressor_ops *decompressor_ops[] = {
+static const struct decompressor_ops * const decompressor_ops[] = {
 	[WIMLIB_COMPRESSION_TYPE_XPRESS] = &xpress_decompressor_ops,
 	[WIMLIB_COMPRESSION_TYPE_LZX]    = &lzx_decompressor_ops,
 	[WIMLIB_COMPRESSION_TYPE_LZMS]   = &lzms_decompressor_ops,
+#ifdef WITH_ZSTD
+	[WIMLIB_COMPRESSION_TYPE_ZSTD]   = &zstd_decompressor_ops,
+#endif
 };
 
 static bool
@@ -58,16 +60,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 +94,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);