fix uncompress stream and manage context

Author: remicollet

tests/xzcode_advanced.phpt

@@ -3,7 +3,7 @@ Test `xzencode` and `xzdecode`: big inputs.
 --SKIPIF--
 <?php
 if (!extension_loaded("xz")) {
-	print("XZ extension is not loaded!");
+	die("skip XZ extension is not loaded!");
 }
 ?>
 --FILE--

tests/xzcode_basic.phpt

@@ -3,7 +3,7 @@ Test `xzencode` and `xzdecode`: basic functionality.
 --SKIPIF--
 <?php
 if (!extension_loaded("xz")) {
-	print("XZ extension is not loaded!");
+	die("skip XZ extension is not loaded!");
 }
 ?>
 --FILE--

tests/xzdecode.phpt

@@ -3,7 +3,7 @@ Test `xzdecode` simple case
 --SKIPIF--
 <?php
 if (!extension_loaded("xz")) {
-	print("XZ extension is not loaded!");
+	die("skip XZ extension is not loaded!");
 }
 ?>
 --FILE--

tests/xzopen_basic.phpt

@@ -3,7 +3,7 @@ Test `xzopen`: basic functionality.
 --SKIPIF--
 <?php
 if (!extension_loaded("xz")) {
-	print("XZ extension is not loaded!");
+	die("skip XZ extension is not loaded!");
 }
 ?>
 --FILE--

tests/xzopen_error.phpt

@@ -3,7 +3,7 @@ Test `xzopen`: error conditions.
 --SKIPIF--
 <?php
 if (!extension_loaded("xz")) {
-	print("XZ extension is not loaded!");
+	die("skip XZ extension is not loaded!");
 }
 ?>
 --FILE--

tests/xzstream.phpt

@@ -0,0 +1,60 @@
+--TEST--
+Test lzma stream
+--SKIPIF--
+<?php
+if (!extension_loaded("xz")) {
+	die("skip XZ extension is not loaded!");
+}
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+?>
+--FILE--
+<?php
+$tmp1 = tempnam(sys_get_temp_dir(), "LZMA");
+$tmp2 = tempnam(sys_get_temp_dir(), "LZMA");
+$tmp3 = tempnam(sys_get_temp_dir(), "LZMA");
+
+$len0 = filesize(PHP_BINARY);
+
+echo "Compress level 2 ($tmp1)\n";
+$opts = [
+	'xz' => [
+		'compression_level' => '2',
+		'max_memory' => 64*1024*1024,
+	]
+];
+$ctx = stream_context_create($opts);
+copy(PHP_BINARY, "compress.lzma://$tmp1");
+$len1 = filesize($tmp1);
+var_dump($len1 > 0);
+var_dump($len1 <= $len0);
+
+echo "Compress level 9 ($tmp2)\n";
+$opts = [
+	'xz' => [
+		'compression_level' => '9',
+		'max_memory' => 64*1024*1024,
+	]
+];
+$ctx = stream_context_create($opts);
+copy(PHP_BINARY, "compress.lzma://$tmp2", $ctx);
+$len2 = filesize($tmp2);
+var_dump($len2 > 0);
+var_dump($len2 <= $len1);
+
+echo "Uncompress ($tmp3)\n";
+copy("compress.lzma://$tmp1", $tmp3);
+$len3 = filesize($tmp3);
+var_dump($len3 > 0);
+var_dump($len3 == $len0);
+
+?>
+--EXPECTF--
+Compress level 2 (%s)
+bool(true)
+bool(true)
+Compress level 9 (%s)
+bool(true)
+bool(true)
+Uncompress (%s)
+bool(true)
+bool(true)

tests/xzwrite_basic.phpt

@@ -3,7 +3,7 @@ Test function xzwrite() by calling it with its expected arguments
 --SKIPIF--
 <?php
 if (!extension_loaded("xz")) {
-	print("XZ extension is not loaded!");
+	die("skip XZ extension is not loaded!");
 }
 ?>
 --FILE--

xz_fopen_wrapper.c

@@ -57,6 +57,9 @@ struct php_xz_stream_data_t {
 
 	/* Compression level used. */
 	unsigned long level;
+
+	/* The maximum amount of memory that can be used when decompressing. */
+	uint64_t memory;
 };
 /* }}} */
 
@@ -68,6 +71,7 @@ static int php_xz_decompress(struct php_xz_stream_data_t *self)
 {
 	lzma_stream *strm = &self->strm;
 	lzma_action action = LZMA_RUN;
+	lzma_ret ret;
 
 	if (strm->avail_in == 0 && !php_stream_eof(self->stream)) {
 #if PHP_VERSION_ID >= 70400
@@ -78,20 +82,15 @@ static int php_xz_decompress(struct php_xz_stream_data_t *self)
 		strm->avail_in = read;
 #else
 		strm->avail_in = php_stream_read(self->stream, (char *)self->in_buf, self->in_buf_sz);
-		strm->next_in = self->in_buf;
 #endif
+		strm->next_in = self->in_buf;
 	}
 
-	if (lzma_code(strm, action) != LZMA_OK) {
+	ret = lzma_code(strm, action);
+	if (ret != LZMA_OK && ret != LZMA_STREAM_END) {
 		return -1;
 	}
 
-	if (strm->avail_out == 0 && self->out_buf_idx == strm->next_out) {
-		/* All bytes in the output buffer have been read. */
-		strm->next_out = self->out_buf_idx = self->out_buf;
-		strm->avail_out = self->out_buf_sz;
-	}
-
 	return 0;
 }
 /* }}} */
@@ -135,8 +134,7 @@ static int php_xz_init_decoder(struct php_xz_stream_data_t *self)
 {
 	lzma_stream *strm = &self->strm;
 
-	uint64_t mem = INI_INT("xz.max_memory");
-	if (lzma_auto_decoder(strm, mem ? mem : UINT64_MAX, LZMA_CONCATENATED) != LZMA_OK) {
+	if (lzma_auto_decoder(strm, self->memory ? self->memory : UINT64_MAX, LZMA_CONCATENATED) != LZMA_OK) {
 		return 0;
 	}
 
@@ -202,6 +200,7 @@ static size_t php_xziop_read(php_stream *stream, char *buf, size_t count)
 	struct php_xz_stream_data_t *self = (struct php_xz_stream_data_t *) stream->abstract;
 	lzma_stream *strm = &self->strm;
 
+
 	size_t to_read = count, have_read = 0;
 
 	while (to_read > 0) {
@@ -214,8 +213,12 @@ static size_t php_xziop_read(php_stream *stream, char *buf, size_t count)
 			memcpy(buf + have_read, self->out_buf_idx, strm->next_out - self->out_buf_idx);
 			have_read += strm->next_out - self->out_buf_idx;
 			to_read -= strm->next_out - self->out_buf_idx;
-			self->out_buf_idx = strm->next_out;
-			if (strm->next_out == self->out_buf_idx) {
+
+			if (strm->avail_out) {
+				self->out_buf_idx = strm->next_out;
+			} else {
+				/* All bytes in the output buffer have been read. */
+				self->out_buf_idx = strm->next_out;
 				self->out_buf_idx = strm->next_out = self->out_buf;
 				strm->avail_out = self->out_buf_sz;
 			}
@@ -226,6 +229,7 @@ static size_t php_xziop_read(php_stream *stream, char *buf, size_t count)
 			return have_read;
 		}
 
+
 		if (php_xz_decompress(self) < 0) {
 #if PHP_VERSION_ID >= 70400
 			if (!have_read) {
@@ -362,16 +366,14 @@ php_stream_ops php_stream_xzio_ops = {
 php_stream *php_stream_xzopen(php_stream_wrapper *wrapper, const char *path, const char *mode_pass, int options, zend_string **opened_path, php_stream_context *context STREAMS_DC)
 {
 	char mode[64];
-	unsigned long level = 6;
+	zend_ulong level = INI_INT("xz.compression_level");;
+	zend_ulong mem = INI_INT("xz.max_memory");
+
 	php_stream *stream = NULL, *innerstream = NULL;
 
 	strncpy(mode, mode_pass, sizeof(mode));
 	mode[sizeof(mode) - 1] = '\0';
 
-	/* The pointer below is freed even though it is `const` because it was
-	   manually allocated in `xzopen`.. */
-	efree((char *) mode_pass);
-
 	/* Split compression level and mode. */
 	char *colonp = strchr(mode, ':');
 	if (colonp) {
@@ -393,6 +395,16 @@ php_stream *php_stream_xzopen(php_stream_wrapper *wrapper, const char *path, con
 		path += 16;
 	}
 
+	if (context) {
+		zval *tmpzval;
+		if (NULL != (tmpzval = php_stream_context_get_option(context, "xz", "compression_level"))) {
+			level = zval_get_long(tmpzval);
+		}
+		if (NULL != (tmpzval = php_stream_context_get_option(context, "xz", "max_memory"))) {
+			mem = zval_get_long(tmpzval);
+		}
+	}
+
 	innerstream = php_stream_open_wrapper_ex(path, mode, STREAM_MUST_SEEK | options | STREAM_WILL_CAST, opened_path, context);
 
 	if (innerstream) {
@@ -402,6 +414,7 @@ php_stream *php_stream_xzopen(php_stream_wrapper *wrapper, const char *path, con
 			self->stream = innerstream;
 			self->fd = fd;
 			self->level = level;
+			self->memory = mem;
 			strncpy(self->mode, mode, sizeof(self->mode));
 			stream = php_stream_alloc_rel(&php_stream_xzio_ops, self, 0, mode);