Fixed length calculation.

KN4CK3R · KN4CK3R · commit e5c9b913a353 · 2019-05-05T23:06:32.000+02:00
diff --git a/ReClass.NET/Memory/MemoryBuffer.cs b/ReClass.NET/Memory/MemoryBuffer.cs
@@ -151,7 +151,7 @@ public T ReadObject<T>(int offset) where T : struct
 			offset = Offset + offset;
 			if (offset + Marshal.SizeOf(typeof(T)) > data.Length)
 			{
-				return default(T);
+				return default;
 			}
 
 			var handle = GCHandle.Alloc(data, GCHandleType.Pinned);
@@ -173,7 +173,7 @@ public sbyte ReadInt8(int offset)
 			offset = Offset + offset;
 			if (offset + sizeof(sbyte) > data.Length)
 			{
-				return default(sbyte);
+				return default;
 			}
 
 			return (sbyte)data[offset];
@@ -189,7 +189,7 @@ public byte ReadUInt8(int offset)
 			offset = Offset + offset;
 			if (offset + sizeof(byte) > data.Length)
 			{
-				return default(byte);
+				return default;
 			}
 
 			return data[offset];
@@ -205,7 +205,7 @@ public short ReadInt16(int offset)
 			offset = Offset + offset;
 			if (offset + sizeof(short) > data.Length)
 			{
-				return default(short);
+				return default;
 			}
 
 			return BitConverter.ToInt16(data, offset);
@@ -221,7 +221,7 @@ public ushort ReadUInt16(int offset)
 			offset = Offset + offset;
 			if (offset + sizeof(ushort) > data.Length)
 			{
-				return default(ushort);
+				return default;
 			}
 
 			return BitConverter.ToUInt16(data, offset);
@@ -237,7 +237,7 @@ public int ReadInt32(int offset)
 			offset = Offset + offset;
 			if (offset + sizeof(int) > data.Length)
 			{
-				return default(int);
+				return default;
 			}
 
 			return BitConverter.ToInt32(data, offset);
@@ -253,7 +253,7 @@ public uint ReadUInt32(int offset)
 			offset = Offset + offset;
 			if (offset + sizeof(uint) > data.Length)
 			{
-				return default(uint);
+				return default;
 			}
 
 			return BitConverter.ToUInt32(data, offset);
@@ -269,7 +269,7 @@ public long ReadInt64(int offset)
 			offset = Offset + offset;
 			if (offset + sizeof(long) > data.Length)
 			{
-				return default(long);
+				return default;
 			}
 
 			return BitConverter.ToInt64(data, offset);
@@ -285,7 +285,7 @@ public ulong ReadUInt64(int offset)
 			offset = Offset + offset;
 			if (offset + sizeof(ulong) > data.Length)
 			{
-				return default(ulong);
+				return default;
 			}
 
 			return BitConverter.ToUInt64(data, offset);
@@ -301,7 +301,7 @@ public float ReadFloat(int offset)
 			offset = Offset + offset;
 			if (offset + sizeof(float) > data.Length)
 			{
-				return default(float);
+				return default;
 			}
 
 			return BitConverter.ToSingle(data, offset);
@@ -317,7 +317,7 @@ public double ReadDouble(int offset)
 			offset = Offset + offset;
 			if (offset + sizeof(double) > data.Length)
 			{
-				return default(double);
+				return default;
 			}
 
 			return BitConverter.ToDouble(data, offset);
@@ -373,7 +373,12 @@ public string ReadString(Encoding encoding, int offset, int length)
 
 			if (Offset + offset + length > data.Length)
 			{
-				length = data.Length - Offset - offset;
+				length = Math.Max(data.Length - Offset - offset, 0);
+			}
+
+			if (length <= 0)
+			{
+				return string.Empty;
 			}
 
 			var sb = new StringBuilder(encoding.GetString(data, Offset + offset, length));

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public T ReadObject<T>(int offset) where T : struct`
`151`	`151`	`offset = Offset + offset;`
`152`	`152`	`if (offset + Marshal.SizeOf(typeof(T)) > data.Length)`
`153`	`153`	`{`
`154`		`- return default(T);`
	`154`	`+ return default;`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`var handle = GCHandle.Alloc(data, GCHandleType.Pinned);`
`@@ -173,7 +173,7 @@ public sbyte ReadInt8(int offset)`
`173`	`173`	`offset = Offset + offset;`
`174`	`174`	`if (offset + sizeof(sbyte) > data.Length)`
`175`	`175`	`{`
`176`		`- return default(sbyte);`
	`176`	`+ return default;`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`return (sbyte)data[offset];`
`@@ -189,7 +189,7 @@ public byte ReadUInt8(int offset)`
`189`	`189`	`offset = Offset + offset;`
`190`	`190`	`if (offset + sizeof(byte) > data.Length)`
`191`	`191`	`{`
`192`		`- return default(byte);`
	`192`	`+ return default;`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`return data[offset];`
`@@ -205,7 +205,7 @@ public short ReadInt16(int offset)`
`205`	`205`	`offset = Offset + offset;`
`206`	`206`	`if (offset + sizeof(short) > data.Length)`
`207`	`207`	`{`
`208`		`- return default(short);`
	`208`	`+ return default;`
`209`	`209`	`}`
`210`	`210`
`211`	`211`	`return BitConverter.ToInt16(data, offset);`
`@@ -221,7 +221,7 @@ public ushort ReadUInt16(int offset)`
`221`	`221`	`offset = Offset + offset;`
`222`	`222`	`if (offset + sizeof(ushort) > data.Length)`
`223`	`223`	`{`
`224`		`- return default(ushort);`
	`224`	`+ return default;`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`return BitConverter.ToUInt16(data, offset);`
`@@ -237,7 +237,7 @@ public int ReadInt32(int offset)`
`237`	`237`	`offset = Offset + offset;`
`238`	`238`	`if (offset + sizeof(int) > data.Length)`
`239`	`239`	`{`
`240`		`- return default(int);`
	`240`	`+ return default;`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`return BitConverter.ToInt32(data, offset);`
`@@ -253,7 +253,7 @@ public uint ReadUInt32(int offset)`
`253`	`253`	`offset = Offset + offset;`
`254`	`254`	`if (offset + sizeof(uint) > data.Length)`
`255`	`255`	`{`
`256`		`- return default(uint);`
	`256`	`+ return default;`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`return BitConverter.ToUInt32(data, offset);`
`@@ -269,7 +269,7 @@ public long ReadInt64(int offset)`
`269`	`269`	`offset = Offset + offset;`
`270`	`270`	`if (offset + sizeof(long) > data.Length)`
`271`	`271`	`{`
`272`		`- return default(long);`
	`272`	`+ return default;`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`return BitConverter.ToInt64(data, offset);`
`@@ -285,7 +285,7 @@ public ulong ReadUInt64(int offset)`
`285`	`285`	`offset = Offset + offset;`
`286`	`286`	`if (offset + sizeof(ulong) > data.Length)`
`287`	`287`	`{`
`288`		`- return default(ulong);`
	`288`	`+ return default;`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`return BitConverter.ToUInt64(data, offset);`
`@@ -301,7 +301,7 @@ public float ReadFloat(int offset)`
`301`	`301`	`offset = Offset + offset;`
`302`	`302`	`if (offset + sizeof(float) > data.Length)`
`303`	`303`	`{`
`304`		`- return default(float);`
	`304`	`+ return default;`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`return BitConverter.ToSingle(data, offset);`
`@@ -317,7 +317,7 @@ public double ReadDouble(int offset)`
`317`	`317`	`offset = Offset + offset;`
`318`	`318`	`if (offset + sizeof(double) > data.Length)`
`319`	`319`	`{`
`320`		`- return default(double);`
	`320`	`+ return default;`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`return BitConverter.ToDouble(data, offset);`
`@@ -373,7 +373,12 @@ public string ReadString(Encoding encoding, int offset, int length)`
`373`	`373`
`374`	`374`	`if (Offset + offset + length > data.Length)`
`375`	`375`	`{`
`376`		`- length = data.Length - Offset - offset;`
	`376`	`+ length = Math.Max(data.Length - Offset - offset, 0);`
	`377`	`+ }`
	`378`	`+`
	`379`	`+ if (length <= 0)`
	`380`	`+ {`
	`381`	`+ return string.Empty;`
`377`	`382`	`}`
`378`	`383`
`379`	`384`	`var sb = new StringBuilder(encoding.GetString(data, Offset + offset, length));`