diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index 4059335f07..8b61527dbd 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -651,6 +651,7 @@ + diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/BitConverterCompat.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/BitConverterCompat.cs new file mode 100644 index 0000000000..ace456145a --- /dev/null +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/BitConverterCompat.cs @@ -0,0 +1,16 @@ +using System; + +namespace Microsoft.Data.SqlClient +{ + internal static class BitConverterCompat + { + public static unsafe int SingleToInt32Bits(float value) + { + return *(int*)(&value); + } + public static unsafe float Int32BitsToSingle(int value) + { + return *(float*)(&value); + } + } +} diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNICommon.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNICommon.cs index b93ba0749c..ae6a6efcd9 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNICommon.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNICommon.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System; +using System.Buffers.Binary; using System.Diagnostics; using System.Net; using System.Net.Security; @@ -59,10 +60,10 @@ public void Read(byte[] bytes) { SMID = bytes[0]; flags = bytes[1]; - sessionId = BitConverter.ToUInt16(bytes, 2); - length = BitConverter.ToUInt32(bytes, 4) - SNISMUXHeader.HEADER_LENGTH; - sequenceNumber = BitConverter.ToUInt32(bytes, 8); - highwater = BitConverter.ToUInt32(bytes, 12); + sessionId = BinaryPrimitives.ReadUInt16LittleEndian(new ReadOnlySpan(bytes, 2, 2)); + length = BinaryPrimitives.ReadUInt32LittleEndian(new ReadOnlySpan(bytes, 4, 4)) - SNISMUXHeader.HEADER_LENGTH; + sequenceNumber = BinaryPrimitives.ReadUInt32LittleEndian(new ReadOnlySpan(bytes, 8, 4)); + highwater = BinaryPrimitives.ReadUInt32LittleEndian(new ReadOnlySpan(bytes, 12, 4)); } public void Write(Span bytes) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.NetCoreApp.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.NetCoreApp.cs index d8026b36e3..2c0370de16 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.NetCoreApp.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.NetCoreApp.cs @@ -4,6 +4,9 @@ using System; using System.Diagnostics; +#if NETCOREAPP +using System.Buffers.Binary; +#endif namespace Microsoft.Data.SqlClient { @@ -11,9 +14,19 @@ internal sealed partial class TdsParser { internal static void FillGuidBytes(Guid guid, Span buffer) => guid.TryWriteBytes(buffer); - internal static void FillDoubleBytes(double value, Span buffer) => BitConverter.TryWriteBytes(buffer, value); + internal static void FillDoubleBytes(double value, Span buffer) => +#if NETCOREAPP + BinaryPrimitives.WriteDoubleLittleEndian(buffer, value); +#else + BitConverter.TryWriteBytes(buffer, value); +#endif - internal static void FillFloatBytes(float v, Span buffer) => BitConverter.TryWriteBytes(buffer, v); + internal static void FillFloatBytes(float v, Span buffer) => +#if NETCOREAPP + BinaryPrimitives.WriteSingleLittleEndian(buffer, v); +#else + BitConverter.TryWriteBytes(buffer, v); +#endif internal static Guid ConstructGuid(ReadOnlySpan bytes) { diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs index bde99cda5e..d556144c8f 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs @@ -1,9 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. - using System; using System.Buffers; +using System.Buffers.Binary; using System.Collections.Generic; using System.Data; using System.Data.SqlTypes; @@ -1743,14 +1743,10 @@ internal void WriteInt(int v, TdsParserStateObject stateObj) internal static void WriteInt(Span buffer, int value) { -#if NETCOREAPP - BitConverter.TryWriteBytes(buffer, value); -#else buffer[0] = (byte)(value & 0xff); buffer[1] = (byte)((value >> 8) & 0xff); buffer[2] = (byte)((value >> 16) & 0xff); buffer[3] = (byte)((value >> 24) & 0xff); -#endif } // @@ -1763,7 +1759,9 @@ internal byte[] SerializeFloat(float v) throw ADP.ParameterValueOutOfRange(v.ToString()); } - return BitConverter.GetBytes(v); + var bytes = new byte[4]; + BinaryPrimitives.WriteInt32LittleEndian(bytes, BitConverterCompat.SingleToInt32Bits(v)); + return bytes; } internal void WriteFloat(float v, TdsParserStateObject stateObj) @@ -1886,7 +1884,9 @@ internal byte[] SerializeDouble(double v) throw ADP.ParameterValueOutOfRange(v.ToString()); } - return BitConverter.GetBytes(v); + var bytes = new byte[8]; + BinaryPrimitives.WriteInt64LittleEndian(bytes, BitConverter.DoubleToInt64Bits(v)); + return bytes; } internal void WriteDouble(double v, TdsParserStateObject stateObj) @@ -3808,8 +3808,8 @@ private bool TryProcessFedAuthInfo(TdsParserStateObject stateObj, int tokenLen, uint currentOptionOffset = checked(i * optionSize); byte id = tokenData[currentOptionOffset]; - uint dataLen = BitConverter.ToUInt32(tokenData, checked((int)(currentOptionOffset + 1))); - uint dataOffset = BitConverter.ToUInt32(tokenData, checked((int)(currentOptionOffset + 5))); + uint dataLen = BinaryPrimitives.ReadUInt32LittleEndian(new ReadOnlySpan(tokenData, checked((int)(currentOptionOffset + 1)), 4)); + uint dataOffset = BinaryPrimitives.ReadUInt32LittleEndian(new ReadOnlySpan(tokenData, checked((int)(currentOptionOffset + 5)), 4)); if (SqlClientEventSource.Log.IsAdvancedTraceOn()) { SqlClientEventSource.Log.AdvancedTraceEvent(" FedAuthInfoOpt: ID={0}, DataLen={1}, Offset={2}", id, dataLen.ToString(CultureInfo.InvariantCulture), dataOffset.ToString(CultureInfo.InvariantCulture)); @@ -5771,7 +5771,7 @@ internal bool DeserializeUnencryptedValue(SqlBuffer value, byte[] unencryptedByt return false; } - longValue = BitConverter.ToInt64(unencryptedBytes, 0); + longValue = BinaryPrimitives.ReadInt64LittleEndian(new ReadOnlySpan(unencryptedBytes, 0, 8)); if (tdsType == TdsEnums.SQLBIT || tdsType == TdsEnums.SQLBITN) @@ -5808,8 +5808,7 @@ internal bool DeserializeUnencryptedValue(SqlBuffer value, byte[] unencryptedByt { return false; } - - singleValue = BitConverter.ToSingle(unencryptedBytes, 0); + singleValue = BitConverterCompat.Int32BitsToSingle(BinaryPrimitives.ReadInt32LittleEndian(unencryptedBytes)); value.Single = singleValue; break; @@ -5820,7 +5819,7 @@ internal bool DeserializeUnencryptedValue(SqlBuffer value, byte[] unencryptedByt return false; } - doubleValue = BitConverter.ToDouble(unencryptedBytes, 0); + doubleValue = BitConverter.Int64BitsToDouble(BinaryPrimitives.ReadInt64LittleEndian(unencryptedBytes)); value.Double = doubleValue; break; @@ -5837,8 +5836,8 @@ internal bool DeserializeUnencryptedValue(SqlBuffer value, byte[] unencryptedByt return false; } - mid = BitConverter.ToInt32(unencryptedBytes, 0); - lo = BitConverter.ToUInt32(unencryptedBytes, 4); + mid = BinaryPrimitives.ReadInt32LittleEndian(new ReadOnlySpan(unencryptedBytes, 0, 4)); + lo = BinaryPrimitives.ReadUInt32LittleEndian(new ReadOnlySpan(unencryptedBytes, 4, 4)); long l = (((long)mid) << 0x20) + ((long)lo); value.SetToMoney(l); @@ -5875,8 +5874,8 @@ internal bool DeserializeUnencryptedValue(SqlBuffer value, byte[] unencryptedByt return false; } - daypart = BitConverter.ToInt32(unencryptedBytes, 0); - timepart = BitConverter.ToUInt32(unencryptedBytes, 4); + daypart = BinaryPrimitives.ReadInt32LittleEndian(new ReadOnlySpan(unencryptedBytes, 0, 4)); + timepart = BinaryPrimitives.ReadUInt32LittleEndian(new ReadOnlySpan(unencryptedBytes, 4, 4)); value.SetToDateTime(daypart, (int)timepart); break; @@ -5922,7 +5921,7 @@ internal bool DeserializeUnencryptedValue(SqlBuffer value, byte[] unencryptedByt for (int i = 0; i < decLength; i++) { // up to 16 bytes of data following the sign byte - bits[i] = BitConverter.ToInt32(unencryptedBytes, index); + bits[i] = BinaryPrimitives.ReadInt32LittleEndian(new ReadOnlySpan(unencryptedBytes, index, 4)); index += 4; } value.SetToDecimal(md.baseTI.precision, md.baseTI.scale, fPositive, bits); @@ -7490,7 +7489,20 @@ internal Task WriteString(string s, int length, int offset, TdsParserStateObject private static void CopyCharsToBytes(char[] source, int sourceOffset, byte[] dest, int destOffset, int charLength) { - Buffer.BlockCopy(source, sourceOffset, dest, destOffset, charLength * ADP.CharSize); + if (!BitConverter.IsLittleEndian) + { + int desti = 0; + for(int srci = 0; srci < charLength; srci++) + { + dest[desti + destOffset] = (byte)(source[srci + sourceOffset]); + dest[desti + destOffset+1] = (byte)(source[srci + sourceOffset] >> 8); + desti += 2; + } + } + else + { + Buffer.BlockCopy(source, sourceOffset, dest, destOffset, charLength * ADP.CharSize); + } } private static void CopyStringToBytes(string source, int sourceOffset, byte[] dest, int destOffset, int charLength) @@ -12571,7 +12583,6 @@ private bool TryReadPlpUnicodeCharsChunk(char[] buff, int offst, int len, TdsPar { charsToRead = (int)(stateObj._longlenleft >> 1); } - if (!stateObj.TryReadChars(buff, offst, charsToRead, out charsRead)) { charsRead = 0; diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs index 9ac485cbbb..b8369e4b7d 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs @@ -4,6 +4,7 @@ using System; using System.Diagnostics; +using System.Buffers.Binary; using System.Runtime.InteropServices; using System.Security; using System.Threading; @@ -527,7 +528,7 @@ internal bool TryReadInt64(out long value) Debug.Assert(_bTmpRead + bytesRead == 8, "TryReadByteArray returned true without reading all data required"); _bTmpRead = 0; AssertValidState(); - value = BitConverter.ToInt64(_bTmp, 0); + value = BinaryPrimitives.ReadInt64LittleEndian(_bTmp); return true; } } @@ -536,8 +537,7 @@ internal bool TryReadInt64(out long value) // The entire long is in the packet and in the buffer, so just return it // and take care of the counters. - value = BitConverter.ToInt64(_inBuff, _inBytesUsed); - + value = BinaryPrimitives.ReadInt64LittleEndian(new ReadOnlySpan(_inBuff, _inBytesUsed, 8)); _inBytesUsed += 8; _inBytesPacket -= 8; @@ -605,7 +605,7 @@ internal bool TryReadUInt32(out uint value) Debug.Assert(_bTmpRead + bytesRead == 4, "TryReadByteArray returned true without reading all data required"); _bTmpRead = 0; AssertValidState(); - value = BitConverter.ToUInt32(_bTmp, 0); + value = BinaryPrimitives.ReadUInt32LittleEndian(_bTmp); return true; } } @@ -614,7 +614,7 @@ internal bool TryReadUInt32(out uint value) // The entire int is in the packet and in the buffer, so just return it // and take care of the counters. - value = BitConverter.ToUInt32(_inBuff, _inBytesUsed); + value = BinaryPrimitives.ReadUInt32LittleEndian(new ReadOnlySpan(_inBuff, _inBytesUsed, 4)); _inBytesUsed += 4; _inBytesPacket -= 4; @@ -639,16 +639,14 @@ internal bool TryReadSingle(out float value) } AssertValidState(); - value = BitConverter.ToSingle(_bTmp, 0); + value = BitConverterCompat.Int32BitsToSingle(BinaryPrimitives.ReadInt32LittleEndian(_bTmp)); return true; } else { // The entire float is in the packet and in the buffer, so just return it // and take care of the counters. - - value = BitConverter.ToSingle(_inBuff, _inBytesUsed); - + value = BitConverterCompat.Int32BitsToSingle(BinaryPrimitives.ReadInt32LittleEndian(new ReadOnlySpan(_inBuff, _inBytesUsed, 4))); _inBytesUsed += 4; _inBytesPacket -= 4; @@ -672,7 +670,7 @@ internal bool TryReadDouble(out double value) } AssertValidState(); - value = BitConverter.ToDouble(_bTmp, 0); + value = BitConverter.Int64BitsToDouble(BinaryPrimitives.ReadInt64LittleEndian(_bTmp)); return true; } else @@ -680,8 +678,7 @@ internal bool TryReadDouble(out double value) // The entire double is in the packet and in the buffer, so just return it // and take care of the counters. - value = BitConverter.ToDouble(_inBuff, _inBytesUsed); - + value = BitConverter.Int64BitsToDouble(BinaryPrimitives.ReadInt64LittleEndian(new ReadOnlySpan(_inBuff, _inBytesUsed, 8))); _inBytesUsed += 8; _inBytesPacket -= 8; @@ -1793,6 +1790,16 @@ private void SetBufferSecureStrings() str = Marshal.SecureStringToBSTR(_securePasswords[i]); byte[] data = new byte[_securePasswords[i].Length * 2]; Marshal.Copy(str, data, 0, _securePasswords[i].Length * 2); + if (!BitConverter.IsLittleEndian) + { + byte temp; + for (int ii = 0; ii < _securePasswords[i].Length * 2; ii += 2) + { + temp = (byte)data[ii]; + data[ii] = (byte)data[ii + 1]; + data[ii + 1] = (byte)temp; + } + } TdsParserStaticMethods.ObfuscatePassword(data); data.CopyTo(_outBuff, _securePasswordOffsetsInBuffer[i]); } @@ -2059,7 +2066,6 @@ internal void WriteSecureString(SecureString secureString) Debug.Assert(_securePasswords[0] == null || _securePasswords[1] == null, "There are more than two secure passwords"); int index = _securePasswords[0] != null ? 1 : 0; - _securePasswords[index] = secureString; _securePasswordOffsetsInBuffer[index] = _outBytesUsed; @@ -2294,7 +2300,8 @@ internal Task WritePacket(byte flushMode, bool canAccumulate = false) // So we need to avoid this check prior to login completing state == TdsParserState.OpenLoggedIn && !_bulkCopyOpperationInProgress // ignore the condition checking for bulk copy - && _outBytesUsed == (_outputHeaderLen + BitConverter.ToInt32(_outBuff, _outputHeaderLen)) + && _outBytesUsed == (_outputHeaderLen + + BinaryPrimitives.ReadInt32LittleEndian(new ReadOnlySpan(_outBuff, _outputHeaderLen, 4))) && _outputPacketCount == 0 || _outBytesUsed == _outputHeaderLen && _outputPacketCount == 0) diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs index 436ad67c8e..78ae7f82cf 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlSequentialTextReader.cs @@ -514,6 +514,16 @@ public override void Convert(byte[] bytes, int byteIndex, int byteCount, char[] completed = (bytesUsed == byteCount); // BlockCopy uses offsets\length measured in bytes, not the actual array index + if (!BitConverter.IsLittleEndian) + { + byte temp; + for (int ii = 0; ii < byteCount; ii += 2) + { + temp = bytes[ii]; + bytes[ii] = bytes[ii + 1]; + bytes[ii + 1] = temp; + } + } Buffer.BlockCopy(bytes, byteIndex, chars, charIndex * 2, bytesUsed); } } diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs index 7147c10e5a..941410b314 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System; +using System.Buffers.Binary; using System.Collections.Generic; using System.Diagnostics; using System.Security; @@ -527,6 +528,13 @@ internal bool TryReadChars(char[] chars, int charsOffset, int charsCount, out in } } } + if (!BitConverter.IsLittleEndian) + { + for (int ii = charsOffset; ii < charsCopied + charsOffset; ii++) + { + chars[ii] = (char)BinaryPrimitives.ReverseEndianness((ushort)chars[ii]); + } + } return true; } diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsValueSetter.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsValueSetter.cs index fd50f68a0b..e0174095b2 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsValueSetter.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsValueSetter.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System; +using System.Buffers.Binary; using System.Data; using System.Data.SqlTypes; using System.Diagnostics; @@ -586,9 +587,9 @@ internal void SetDateTime(DateTime value) if (SqlDbType.DateTime2 == _metaData.SqlDbType) { long time = value.TimeOfDay.Ticks / TdsEnums.TICKS_FROM_SCALE[_metaData.Scale]; - _stateObj.WriteByteArray(BitConverter.GetBytes(time), (int)_metaData.MaxLength - 3, 0); + _stateObj.WriteByteArray(BitConverter.GetBytes(BinaryPrimitives.ReadInt64LittleEndian(BitConverter.GetBytes(time))), (int)_metaData.MaxLength - 3, 0); } - _stateObj.WriteByteArray(BitConverter.GetBytes(days), 3, 0); + _stateObj.WriteByteArray(BitConverter.GetBytes(BinaryPrimitives.ReadInt32LittleEndian(BitConverter.GetBytes(days))), 3, 0); } } } @@ -646,7 +647,7 @@ internal void SetTimeSpan(TimeSpan value) _stateObj.WriteByte(length); } long time = value.Ticks / TdsEnums.TICKS_FROM_SCALE[scale]; - _stateObj.WriteByteArray(BitConverter.GetBytes(time), length, 0); + _stateObj.WriteByteArray(BitConverter.GetBytes(BinaryPrimitives.ReadInt64LittleEndian(BitConverter.GetBytes(time))), length, 0); } // valid for DateTimeOffset @@ -677,8 +678,8 @@ internal void SetDateTimeOffset(DateTimeOffset value) int days = utcDateTime.Subtract(DateTime.MinValue).Days; short offset = (short)value.Offset.TotalMinutes; - _stateObj.WriteByteArray(BitConverter.GetBytes(time), length - 5, 0); // time - _stateObj.WriteByteArray(BitConverter.GetBytes(days), 3, 0); // date + _stateObj.WriteByteArray(BitConverter.GetBytes(BinaryPrimitives.ReadInt64LittleEndian(BitConverter.GetBytes(time))), length - 5, 0); // time + _stateObj.WriteByteArray(BitConverter.GetBytes(BinaryPrimitives.ReadInt32LittleEndian(BitConverter.GetBytes(days))), 3, 0); // date _stateObj.WriteByte((byte)(offset & 0xff)); // offset byte 1 _stateObj.WriteByte((byte)((offset >> 8) & 0xff)); // offset byte 2 }