WIXBUG:6299 - Fix OverflowException in ReadUInt32.

wixtoolset · Dec 14, 2020 · 4f4b7d9 · 4f4b7d9
1 parent 2ed6d79
commit 4f4b7d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/history/6299.md b/history/6299.md
@@ -0,0 +1 @@
+* SeanHall: WIXBUG:6299 - Fix OverflowException in ReadUInt32.
diff --git a/src/tools/wix/BurnCommon.cs b/src/tools/wix/BurnCommon.cs
@@ -362,7 +362,7 @@ private static UInt16 ReadUInt16(byte[] bytes, UInt32 offset)
         private static UInt32 ReadUInt32(byte[] bytes, UInt32 offset)
         {
             Debug.Assert(offset + 4 <= bytes.Length);
-            return (UInt32)(bytes[offset] + (bytes[offset + 1] << 8) + (bytes[offset + 2] << 16) + (bytes[offset + 3] << 24));
+            return BurnCommon.ReadUInt16(bytes, offset) + ((UInt32)(BurnCommon.ReadUInt16(bytes, offset + 2)) << 16);
         }
 
         /// <summary>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* SeanHall: WIXBUG:6299 - Fix OverflowException in ReadUInt32.