From 01744b280c6e35d331b9dc4cc64716b82bc8b3db Mon Sep 17 00:00:00 2001
From: Lasse Collin <lasse.collin@tukaani.org>
Date: Tue, 25 Oct 2022 23:09:11 +0300
Subject: [PATCH] xz: Fix --single-stream with an empty .xz Stream.

Example:

    $ xz -dc --single-stream good-0-empty.xz
    xz: good-0-empty.xz: Internal error (bug)

The code, that is tries to catch some input file issues early,
didn't anticipate LZMA_STREAM_END which is possible in that
code only when --single-stream is used.
---
 src/xz/coder.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/xz/coder.c b/src/xz/coder.c
index bc905594..51cd3ef0 100644
--- a/src/xz/coder.c
+++ b/src/xz/coder.c
@@ -557,6 +557,15 @@ coder_init(file_pair *pair)
 					== LZMA_UNSUPPORTED_CHECK)
 				message_warning("%s: %s", pair->src_name,
 						message_strm(ret));
+
+			// With --single-stream lzma_code won't wait for
+			// LZMA_FINISH and thus it can return LZMA_STREAM_END
+			// if the file has no uncompressed data inside.
+			// So treat LZMA_STREAM_END as LZMA_OK here.
+			// When lzma_code() is called again in coder_normal()
+			// it will return LZMA_STREAM_END again.
+			if (ret == LZMA_STREAM_END)
+				ret = LZMA_OK;
 		}
 #endif
 	}