Merge 6ceb473 into cfccc32

mkaring · web-flow · commit 2a23f301ff9f · 2021-01-17T12:13:00.000Z
diff --git a/Confuser.Core/Services/CompressionService.cs b/Confuser.Core/Services/CompressionService.cs
@@ -96,10 +96,13 @@ public byte[] Compress(byte[] data, Action<double> progressFunc = null) {
 			var encoder = new Encoder();
 			encoder.SetCoderProperties(propIDs, properties);
 			encoder.WriteCoderProperties(x);
-			Int64 fileSize;
-			fileSize = data.Length;
-			for (int i = 0; i < 8; i++)
-				x.WriteByte((Byte)(fileSize >> (8 * i)));
+
+			var length = BitConverter.GetBytes(data.Length);
+			if (!BitConverter.IsLittleEndian)
+				Array.Reverse(length);
+			
+			// Store 4 byte length value (little-endian)
+			x.Write(length, 0, sizeof(int));
 
 			ICodeProgress progress = null;
 			if (progressFunc != null)
@@ -156,4 +159,4 @@ public interface ICompressionService {
 		/// <returns>The compressed data.</returns>
 		byte[] Compress(byte[] data, Action<double> progressFunc = null);
 	}
-}
+}
diff --git a/Confuser.Runtime/Lzma.cs b/Confuser.Runtime/Lzma.cs
@@ -32,16 +32,22 @@ public static byte[] Decompress(byte[] data) {
 			var s = new MemoryStream(data);
 			var decoder = new LzmaDecoder();
 			var prop = new byte[5];
-			s.Read(prop, 0, 5);
+			var readCnt = 0;
+			while (readCnt < 5) {
+				readCnt += s.Read(prop, readCnt, 5 - readCnt);
+			}
 			decoder.SetDecoderProperties(prop);
-			long outSize = 0;
-			for (int i = 0; i < 8; i++) {
-				int v = s.ReadByte();
-				outSize |= ((long)(byte)v) << (8 * i);
+
+			readCnt = 0;
+			while (readCnt < sizeof(int)) {
+				readCnt += s.Read(prop, readCnt, sizeof(int) - readCnt);
 			}
-			var b = new byte[(int)outSize];
+			if (!BitConverter.IsLittleEndian)
+				Array.Reverse(prop, 0, sizeof(int));
+			var outSize = BitConverter.ToInt32(prop, 0);
+			var b = new byte[outSize];
 			var z = new MemoryStream(b, true);
-			long compressedSize = s.Length - 13;
+			long compressedSize = s.Length - 5 - sizeof(int);
 			decoder.Code(s, z, compressedSize, outSize);
 			return b;
 		}
@@ -594,4 +600,4 @@ public bool IsCharState() {
 			}
 		}
 	}
-}
+}
