Port #3857 to release/6.1 (#3877)

apoorvdeshmukh · web-flow · commit 6daa25ba2b7e · 2026-01-12T18:32:07.000+05:30
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs
@@ -4180,7 +4180,7 @@ private SqlDataReader TryFetchInputParameterEncryptionInfo(int timeout,
                 {
                     // In BatchRPCMode, the actual T-SQL query is in the first parameter and not present as the rpcName, as is the case with non-BatchRPCMode.
                     // So input parameters start at parameters[1]. parameters[0] is the actual T-SQL Statement. rpcName is sp_executesql.
-                    if (_RPCList[i].systemParams.Length > 1)
+                     if (_RPCList[i].systemParams != null && _RPCList[i].systemParams.Length > 1)
                     {
                         _RPCList[i].needsFetchParameterEncryptionMetadata = true;
 
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs
@@ -4304,7 +4304,7 @@ private SqlDataReader TryFetchInputParameterEncryptionInfo(int timeout,
                 {
                     // In _batchRPCMode, the actual T-SQL query is in the first parameter and not present as the rpcName, as is the case with non-_batchRPCMode.
                     // So input parameters start at parameters[1]. parameters[0] is the actual T-SQL Statement. rpcName is sp_executesql.
-                    if (_RPCList[i].systemParams.Length > 1)
+                     if (_RPCList[i].systemParams != null && _RPCList[i].systemParams.Length > 1)
                     {
                         _RPCList[i].needsFetchParameterEncryptionMetadata = true;
 

Original file line number	Diff line number	Diff line change
`@@ -4180,7 +4180,7 @@ private SqlDataReader TryFetchInputParameterEncryptionInfo(int timeout,`
`4180`	`4180`	`{`
`4181`	`4181`	`// In BatchRPCMode, the actual T-SQL query is in the first parameter and not present as the rpcName, as is the case with non-BatchRPCMode.`
`4182`	`4182`	`// So input parameters start at parameters[1]. parameters[0] is the actual T-SQL Statement. rpcName is sp_executesql.`
`4183`		`- if (_RPCList[i].systemParams.Length > 1)`
	`4183`	`+ if (_RPCList[i].systemParams != null && _RPCList[i].systemParams.Length > 1)`
`4184`	`4184`	`{`
`4185`	`4185`	`_RPCList[i].needsFetchParameterEncryptionMetadata = true;`
`4186`	`4186`
Original file line number	Diff line number	Diff line change
`@@ -4304,7 +4304,7 @@ private SqlDataReader TryFetchInputParameterEncryptionInfo(int timeout,`
`4304`	`4304`	`{`
`4305`	`4305`	`// In _batchRPCMode, the actual T-SQL query is in the first parameter and not present as the rpcName, as is the case with non-_batchRPCMode.`
`4306`	`4306`	`// So input parameters start at parameters[1]. parameters[0] is the actual T-SQL Statement. rpcName is sp_executesql.`
`4307`		`- if (_RPCList[i].systemParams.Length > 1)`
	`4307`	`+ if (_RPCList[i].systemParams != null && _RPCList[i].systemParams.Length > 1)`
`4308`	`4308`	`{`
`4309`	`4309`	`_RPCList[i].needsFetchParameterEncryptionMetadata = true;`
`4310`	`4310`