Skip to content

Fix unaligned memory access errors in TraceEvent #1104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brianrob merged 2 commits into from
Mar 3, 2020
Merged

Fix unaligned memory access errors in TraceEvent #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ebd40c
Fix unaligned memory access errors in TraceEvent
swift-kim Feb 6, 2020
93de528
Use Unsafe.ReadUnaligned instead of Marshal.Read*
swift-kim Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/PerfView/PerfView.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,13 @@
<Link>System.Reflection.Metadata.dll</Link>
<Visible>False</Visible>
</EmbeddedResource>
<EmbeddedResource Include="..\TraceEvent\$(OutDir)System.Runtime.CompilerServices.Unsafe.dll">
<Type>Non-Resx</Type>
<WithCulture>false</WithCulture>
<LogicalName>.\System.Runtime.CompilerServices.Unsafe.dll</LogicalName>
<Link>System.Runtime.CompilerServices.Unsafe.dll</Link>
<Visible>False</Visible>
</EmbeddedResource>
<EmbeddedResource Include="..\TraceEvent\$(OutDir)Microsoft.Diagnostics.Tracing.TraceEvent.xml">
<Type>Non-Resx</Type>
<WithCulture>false</WithCulture>
Expand Down
9 changes: 5 additions & 4 deletions src/TraceEvent/TraceEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#endif
using System.IO;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text;
using Address = System.UInt64;
Expand Down Expand Up @@ -4368,19 +4369,19 @@ internal static unsafe Guid ReadGuid(IntPtr pointer, int offset)
}
internal static unsafe double ReadDouble(IntPtr pointer, int offset)
{
return *((double*)((byte*)pointer.ToPointer() + offset));
return Unsafe.ReadUnaligned<double>((byte*)pointer.ToPointer() + offset);
}
internal static unsafe float ReadSingle(IntPtr pointer, int offset)
{
return *((float*)((byte*)pointer.ToPointer() + offset));
return Unsafe.ReadUnaligned<float>((byte*)pointer.ToPointer() + offset);
}
internal static unsafe long ReadInt64(IntPtr pointer, int offset)
{
return *((long*)((byte*)pointer.ToPointer() + offset));
return Unsafe.ReadUnaligned<long>((byte*)pointer.ToPointer() + offset);
}
internal static unsafe int ReadInt32(IntPtr pointer, int offset)
{
return *((int*)((byte*)pointer.ToPointer() + offset));
return Unsafe.ReadUnaligned<int>((byte*)pointer.ToPointer() + offset);
}
internal static unsafe short ReadInt16(IntPtr pointer, int offset)
{
Expand Down
1 change: 1 addition & 0 deletions src/TraceEvent/TraceEvent.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles" Version="$(MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion)" />
<PackageReference Include="System.Reflection.Metadata" Version="1.5.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />

<!-- *** SourceLink Support *** -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All" />
Expand Down