Merge pull request #5882 from stephentoub/fix_ev_bytearray

stephentoub · web-flow · commit f5a854bd323e · 2016-06-20T15:34:27.000-04:00
Fix EventSource deserializing of byte[]s
diff --git a/src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs b/src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs
@@ -1836,7 +1836,7 @@ private unsafe object DecodeObject(int eventId, int parameterId, ref EventSource
                 dataPointer = data->DataPointer;
                 data++;
                 for (int i = 0; i < cbSize; ++i)
-                    blob[i] = *((byte*)dataPointer);
+                    blob[i] = *((byte*)(dataPointer + i));
                 return blob;
             }
             else if (dataType == typeof(byte*))

Original file line number	Diff line number	Diff line change
`@@ -1836,7 +1836,7 @@ private unsafe object DecodeObject(int eventId, int parameterId, ref EventSource`
`1836`	`1836`	`dataPointer = data->DataPointer;`
`1837`	`1837`	`data++;`
`1838`	`1838`	`for (int i = 0; i < cbSize; ++i)`
`1839`		`- blob[i] = ((byte)dataPointer);`
	`1839`	`+ blob[i] = ((byte)(dataPointer + i));`
`1840`	`1840`	`return blob;`
`1841`	`1841`	`}`
`1842`	`1842`	`else if (dataType == typeof(byte*))`