From 492355157050fc3ee6d381d18d7cc83276432726 Mon Sep 17 00:00:00 2001
From: Moinak Ghosh <moinakg@gmail.com>
Date: Sun, 24 Nov 2013 22:44:35 +0530
Subject: [PATCH] Fix Dispack decoding.

---
 filters/dispack/dis.cpp |  9 ++++++---
 pcompress.c             | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/filters/dispack/dis.cpp b/filters/dispack/dis.cpp
index 3e14378..3c66268 100644
--- a/filters/dispack/dis.cpp
+++ b/filters/dispack/dis.cpp
@@ -1041,16 +1041,19 @@ dispack_decode(uchar_t *from, uint64_t fromlen, uchar_t *to, uint64_t *dstlen)
 		}
 
 		if (type & DISFILTERED) {
-			if (pos_to + sz > to_last)
+			if (pos_to + sz > to_last) {
 				return (-1);
-			if (DisUnFilter(pos, cmpsz, pos_to, sz, 0) != sTRUE)
+			}
+			if (DisUnFilter(pos, cmpsz, pos_to, sz, 0) != sTRUE) {
 				return (-1);
+			}
 			pos += cmpsz;
 			pos_to += sz;
 			len -= cmpsz;
 		} else {
-			if (pos_to + cmpsz > to_last)
+			if (pos_to + cmpsz > to_last) {
 				return (-1);
+			}
 			memcpy(pos_to, pos, cmpsz);
 			pos += cmpsz;
 			pos_to += cmpsz;
diff --git a/pcompress.c b/pcompress.c
index dac13d7..bfef905 100644
--- a/pcompress.c
+++ b/pcompress.c
@@ -308,7 +308,7 @@ preproc_decompress(pc_ctx_t *pctx, compress_func_ptr dec_func, void *src, uint64
 {
 	uchar_t *sorc = (uchar_t *)src, type;
 	int64_t result;
-	uint64_t _dstlen = *dstlen;
+	uint64_t _dstlen = *dstlen, _dstlen1 = *dstlen;
 	DEBUG_STAT_EN(double strt, en);
 
 	type = *sorc;
@@ -337,6 +337,7 @@ preproc_decompress(pc_ctx_t *pctx, compress_func_ptr dec_func, void *src, uint64
 			srclen = _dstlen;
 			*dstlen = _dstlen;
 		} else {
+			log_msg(LOG_ERR, 0, "Delta2 decoding failed.");
 			return (result);
 		}
 	}
@@ -346,24 +347,23 @@ preproc_decompress(pc_ctx_t *pctx, compress_func_ptr dec_func, void *src, uint64
 		hashsize = lzp_hash_size(level);
 		result = lzp_decompress((const uchar_t *)src, (uchar_t *)dst, srclen,
 					hashsize, LZP_DEFAULT_LZPMINLEN, 0);
-		if (result < 0) {
+		if (result > 0) {
+			memcpy(src, dst, result);
+			srclen = result;
+			*dstlen = result;
+			_dstlen = result;
+		} else {
 			log_msg(LOG_ERR, 0, "LZP decompression failed.");
-			return (-1);
+			return (result);
 		}
-		*dstlen = result;
 	}
 
-	/*
-	 * If Dispack is enabled it has to be done first since Dispack analyses the
-	 * x86 instruction stream in the raw data.
-	 */
 	if (type & PREPROC_TYPE_DISPACK) {
-		result = dispack_decode((uchar_t *)src, srclen, (uchar_t *)dst, &_dstlen);
+		result = dispack_decode((uchar_t *)src, srclen, (uchar_t *)dst, &_dstlen1);
 		if (result != -1) {
-			memcpy(src, dst, _dstlen);
-			srclen = _dstlen;
-			*dstlen = _dstlen;
+			*dstlen = _dstlen1;
 		} else {
+			log_msg(LOG_ERR, 0, "Dispack decoding failed.");
 			return (result);
 		}
 	}