Use Unsafe.InitBlock

dotnet · May 9, 2023 · b593c9b · b593c9b
1 parent 68c1005
commit b593c9b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 24 deletions.
diff --git a/src/libraries/System.Data.Odbc/src/Common/System/Data/Common/SafeNativeMethods.cs b/src/libraries/System.Data.Odbc/src/Common/System/Data/Common/SafeNativeMethods.cs
diff --git a/src/libraries/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbBuffer.cs b/src/libraries/System.Data.Odbc/src/Common/System/Data/ProviderBase/DbBuffer.cs
@@ -16,6 +16,8 @@ internal abstract class DbBuffer : SafeHandle
 
         protected unsafe DbBuffer(int initialSize) : base(IntPtr.Zero, true)
         {
+            Debug.Assert(initialSize % IntPtr.Size == 0, $"Expected aligned {nameof(initialSize)}.");
+
             if (0 < initialSize)
             {
                 _bufferLength = initialSize;
@@ -627,7 +629,7 @@ internal unsafe void WriteSingle(int offset, float value)
             WriteInt32(offset, BitConverter.SingleToInt32Bits(value));
         }
 
-        internal void ZeroMemory()
+        internal unsafe void ZeroMemory()
         {
             bool mustRelease = false;
 
@@ -636,7 +638,7 @@ internal void ZeroMemory()
                 DangerousAddRef(ref mustRelease);
 
                 IntPtr ptr = DangerousGetHandle();
-                SafeNativeMethods.ZeroMemory(ptr, Length);
+                Unsafe.InitBlock((void*)ptr, 0, (uint)Length);
             }
             finally
             {

diff --git a/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj b/src/libraries/System.Data.Odbc/src/System.Data.Odbc.csproj
@@ -42,7 +42,6 @@ System.Data.Odbc.OdbcTransaction</PackageDescription>
     <Compile Include="$(CommonPath)System\Data\Common\NameValuePair.cs"
              Link="Common\System\Data\Common\NameValuePair.cs" />
     <Compile Include="Common\System\Data\Common\NameValuePermission.cs" />
-    <Compile Include="Common\System\Data\Common\SafeNativeMethods.cs" />
     <Compile Include="Common\System\Data\DataStorage.cs" />
     <Compile Include="Common\System\Data\ProviderBase\DbBuffer.cs" />
     <Compile Include="$(CommonPath)System\Data\Common\FieldNameLookup.cs"