Skip to content

Commit 0df83f4

Browse files
Merged PR 4031: [5.1.2] | Fix access violation when using Express user instances (#2101)
Ports [#2101](#2101)
1 parent b9f133b commit 0df83f4

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -703,6 +703,7 @@ internal SqlConnectionString(SqlConnectionString connectionOptions, string dataS
703703
_attestationProtocol = connectionOptions._attestationProtocol;
704704
_serverSPN = connectionOptions._serverSPN;
705705
_failoverPartnerSPN = connectionOptions._failoverPartnerSPN;
706+
_hostNameInCertificate = connectionOptions._hostNameInCertificate;
706707
#if NETFRAMEWORK
707708
_connectionReset = connectionOptions._connectionReset;
708709
_contextConnection = connectionOptions._contextConnection;

src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,15 @@ public void Open_ConnectionString_Whitespace()
945945
Assert.NotNull(ex.Message);
946946
}
947947

948+
[Fact]
949+
public void Open_ConnectionString_UserInstance()
950+
{
951+
SqlConnection cn = new SqlConnection("User Instance=true;");
952+
SqlException ex = Assert.Throws<SqlException>(() => cn.Open());
953+
// Throws without access violation
954+
Assert.NotNull(ex.Message);
955+
}
956+
948957
[Fact]
949958
public void ServerVersion_Connection_Closed()
950959
{

0 commit comments

Comments
 (0)