Skip to content

Fix rare multi-packet string corruption #3505

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
merged 4 commits into from
Jul 24, 2025
+214 −27
Merged

Fix rare multi-packet string corruption #3505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a649d89
add test and simplify code to fix problems
Wraith2 Jul 23, 2025
6825cac
review feedback
Wraith2 Jul 23, 2025
db6768b
review feedback
Wraith2 Jul 24, 2025
ef06023
review feedback
Wraith2 Jul 24, 2025
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
13 changes: 6 additions & 7 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13127,11 +13127,10 @@ internal TdsOperationStatus TryReadPlpUnicodeCharsWithContinue(TdsParserStateObj

if (canContinue)
{
if (isContinuing || isStarting)
{
temp = stateObj.TryTakeSnapshotStorage() as char[];
Debug.Assert(temp == null || length == int.MaxValue || temp.Length == length, "stored buffer length must be null or must have been created with the correct length");
}
temp = stateObj.TryTakeSnapshotStorage() as char[];
Debug.Assert(temp != null || !isContinuing, "if continuing stored buffer must be present to contain previous data to continue from");
Debug.Assert(temp == null || length == int.MaxValue || temp.Length == length, "stored buffer length must be null or must have been created with the correct length");

if (temp != null)
{
startOffset = stateObj.GetSnapshotTotalSize();
Expand All @@ -13147,7 +13146,7 @@ internal TdsOperationStatus TryReadPlpUnicodeCharsWithContinue(TdsParserStateObj
supportRentedBuff: !canContinue, // do not use the arraypool if we are going to keep the buffer in the snapshot
rentedBuff: ref buffIsRented,
startOffset,
isStarting || isContinuing
canContinue
);

if (result == TdsOperationStatus.Done)
Expand All @@ -13174,7 +13173,7 @@ internal TdsOperationStatus TryReadPlpUnicodeCharsWithContinue(TdsParserStateObj
}
else if (result == TdsOperationStatus.NeedMoreData)
{
if (isStarting || isContinuing)
if (canContinue)
{
stateObj.SetSnapshotStorage(temp);
}
Expand Down
15 changes: 7 additions & 8 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13317,11 +13317,10 @@ internal TdsOperationStatus TryReadPlpUnicodeCharsWithContinue(TdsParserStateObj

if (canContinue)
{
if (isContinuing || isStarting)
{
temp = stateObj.TryTakeSnapshotStorage() as char[];
Debug.Assert(temp == null || length == int.MaxValue || temp.Length == length, "stored buffer length must be null or must have been created with the correct length");
}
temp = stateObj.TryTakeSnapshotStorage() as char[];
Debug.Assert(temp != null || !isContinuing, "if continuing stored buffer must be present to contain previous data to continue from");
Debug.Assert(temp == null || length == int.MaxValue || temp.Length == length, "stored buffer length must be null or must have been created with the correct length");

if (temp != null)
{
startOffset = stateObj.GetSnapshotTotalSize();
Expand All @@ -13336,8 +13335,8 @@ internal TdsOperationStatus TryReadPlpUnicodeCharsWithContinue(TdsParserStateObj
out length,
supportRentedBuff: !canContinue, // do not use the arraypool if we are going to keep the buffer in the snapshot
rentedBuff: ref buffIsRented,
startOffset,
isStarting || isContinuing
startOffset,
canContinue
);

if (result == TdsOperationStatus.Done)
Expand All @@ -13364,7 +13363,7 @@ internal TdsOperationStatus TryReadPlpUnicodeCharsWithContinue(TdsParserStateObj
}
else if (result == TdsOperationStatus.NeedMoreData)
{
if (isStarting || isContinuing)
if (canContinue)
{
stateObj.SetSnapshotStorage(temp);
}
Expand Down
22 changes: 10 additions & 12 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,11 +1529,10 @@ public TdsOperationStatus TryReadByteArrayWithContinue(int length, out byte[] by
(bool canContinue, bool isStarting, bool isContinuing) = GetSnapshotStatuses();
if (canContinue)
{
if (isContinuing || isStarting)
{
temp = TryTakeSnapshotStorage() as byte[];
Debug.Assert(bytes == null || bytes.Length == length, "stored buffer length must be null or must have been created with the correct length");
}
temp = TryTakeSnapshotStorage() as byte[];
Debug.Assert(temp != null || !isContinuing, "if continuing stored buffer must be present to contain previous data to continue from");
Debug.Assert(bytes == null || bytes.Length == length, "stored buffer length must be null or must have been created with the correct length");

if (temp != null)
{
offset = GetSnapshotTotalSize();
Expand All @@ -1554,7 +1553,7 @@ public TdsOperationStatus TryReadByteArrayWithContinue(int length, out byte[] by
}
else if (result == TdsOperationStatus.NeedMoreData)
{
if (isStarting || isContinuing)
if (canContinue)
{
SetSnapshotStorage(temp);
}
Expand Down Expand Up @@ -1983,11 +1982,10 @@ internal TdsOperationStatus TryReadStringWithEncoding(int length, System.Text.En
int startOffset = 0;
if (canContinue)
{
if (isContinuing || isStarting)
{
buf = TryTakeSnapshotStorage() as byte[];
Debug.Assert(buf == null || buf.Length == length, "stored buffer length must be null or must have been created with the correct length");
}
buf = TryTakeSnapshotStorage() as byte[];
Debug.Assert(buf != null || !isContinuing, "if continuing stored buffer must be present to contain previous data to continue from");
Debug.Assert(buf == null || buf.Length == length, "stored buffer length must be null or must have been created with the correct length");

if (buf != null)
{
startOffset = GetSnapshotTotalSize();
Expand All @@ -2005,7 +2003,7 @@ internal TdsOperationStatus TryReadStringWithEncoding(int length, System.Text.En
{
if (result == TdsOperationStatus.NeedMoreData)
{
if (isStarting || isContinuing)
if (canContinue)
{
SetSnapshotStorage(buf);
}
Expand Down
191 changes: 191 additions & 0 deletions src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/DataReaderTest/DataReaderTest.cs
View file
Open in desktop

Large diffs are not rendered by default.