perf tools: Fix error handling of lzma decompression (ffe67c2f) · Commits · 戴 / test

tools/perf/util/lzma.c

+9 −6

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ int lzma_decompress_to_file(const char *input, int output_fd)
		lzma_action action = LZMA_RUN;
		lzma_stream strm = LZMA_STREAM_INIT;
		lzma_ret ret;
		int err = -1;

		u8 buf_in[BUFSIZE];
		u8 buf_out[BUFSIZE];
		@@ -45,7 +46,7 @@ int lzma_decompress_to_file(const char *input, int output_fd)
		if (ret != LZMA_OK) {
		pr_err("lzma: lzma_stream_decoder failed %s (%d)\n",
		lzma_strerror(ret), ret);
		return -1;
		goto err_fclose;
		}

		strm.next_in = NULL;
		@@ -60,7 +61,7 @@ int lzma_decompress_to_file(const char *input, int output_fd)

		if (ferror(infile)) {
		pr_err("lzma: read error: %s\n", strerror(errno));
		return -1;
		goto err_fclose;
		}

		if (feof(infile))
		@@ -74,7 +75,7 @@ int lzma_decompress_to_file(const char *input, int output_fd)

		if (writen(output_fd, buf_out, write_size) != write_size) {
		pr_err("lzma: write error: %s\n", strerror(errno));
		return -1;
		goto err_fclose;
		}

		strm.next_out = buf_out;
		@@ -83,13 +84,15 @@ int lzma_decompress_to_file(const char *input, int output_fd)

		if (ret != LZMA_OK) {
		if (ret == LZMA_STREAM_END)
		return 0;
		break;

		pr_err("lzma: failed %s\n", lzma_strerror(ret));
		return -1;
		goto err_fclose;
		}
		}

		err = 0;
		err_fclose:
		fclose(infile);
		return 0;
		return err;
		}