Merged PR 4031: [5.1.2] | Fix access violation when using Express use…

…r instances (#2101) Ports [#2101](#2101)
dotnet · Oct 16, 2023 · 0df83f4 · 0df83f4
1 parent b9f133b
commit 0df83f4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionString.cs
@@ -703,6 +703,7 @@ internal SqlConnectionString(SqlConnectionString connectionOptions, string dataS
             _attestationProtocol = connectionOptions._attestationProtocol;
             _serverSPN = connectionOptions._serverSPN;
             _failoverPartnerSPN = connectionOptions._failoverPartnerSPN;
+            _hostNameInCertificate = connectionOptions._hostNameInCertificate;
 #if NETFRAMEWORK
             _connectionReset = connectionOptions._connectionReset;
             _contextConnection = connectionOptions._contextConnection;

diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs
@@ -945,6 +945,15 @@ public void Open_ConnectionString_Whitespace()
             Assert.NotNull(ex.Message);
         }
 
+        [Fact]
+        public void Open_ConnectionString_UserInstance()
+        {
+            SqlConnection cn = new SqlConnection("User Instance=true;");
+            SqlException ex = Assert.Throws<SqlException>(() => cn.Open());
+            // Throws without access violation
+            Assert.NotNull(ex.Message);
+        }
+
         [Fact]
         public void ServerVersion_Connection_Closed()
         {