Skip to content

Conversation

@apoorvdeshmukh
Copy link
Contributor

Description

Port #3857 to release/6.0
Closes #3848

Issues

#3848

Testing

Test to be introduced through #3876

Guidelines

Please review the contribution guidelines before submitting a pull request:

Copilot AI review requested due to automatic review settings January 12, 2026 05:07
@apoorvdeshmukh apoorvdeshmukh requested a review from a team as a code owner January 12, 2026 05:07
@apoorvdeshmukh apoorvdeshmukh added this to the 6.0.5 milestone Jan 12, 2026
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR ports bug fix #3857 to the release/6.0 branch, addressing issue #3848 by adding a null check before accessing the systemParams.Length property in the TryFetchInputParameterEncryptionInfo method. This prevents a potential NullReferenceException when processing batch RPC commands with Always Encrypted column encryption.

Changes:

  • Added null check for systemParams before accessing its Length property in both netfx and netcore implementations

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs Added null check for _RPCList[i].systemParams before checking length in parameter encryption metadata fetching logic
src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs Added null check for _RPCList[i].systemParams before checking length in parameter encryption metadata fetching logic

@codecov
Copy link

codecov bot commented Jan 12, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 63.50%. Comparing base (cda77d0) to head (9596174).
⚠️ Report is 1 commits behind head on release/6.0.

Additional details and impacted files
@@               Coverage Diff               @@
##           release/6.0    #3878      +/-   ##
===============================================
- Coverage        66.72%   63.50%   -3.23%     
===============================================
  Files              285      285              
  Lines            59160    59160              
===============================================
- Hits             39472    37567    -1905     
- Misses           19688    21593    +1905     
Flag Coverage Δ
addons 92.58% <ø> (ø)
netcore 67.95% <100.00%> (-4.47%) ⬇️
netfx 64.99% <100.00%> (-0.31%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@apoorvdeshmukh apoorvdeshmukh merged commit fc0a71b into release/6.0 Jan 12, 2026
246 checks passed
@apoorvdeshmukh apoorvdeshmukh deleted the dev/ad/port3857to60 branch January 12, 2026 13:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants