Fixed nre while disposing NpgsqlRawCopyStream (#3618)

vonzshik · web-flow · commit ad724dd0037d · 2021-03-25T10:39:55.000Z
Fixes #3600
diff --git a/src/Npgsql/NpgsqlRawCopyStream.cs b/src/Npgsql/NpgsqlRawCopyStream.cs
@@ -442,7 +442,7 @@ void Cleanup()
         {
             Log.Debug("COPY operation ended", _connector.Id);
             _connector.CurrentCopyOperation = null;
-            _connector.Connection!.EndBindingScope(ConnectorBindingScope.Copy);
+            _connector.Connection?.EndBindingScope(ConnectorBindingScope.Copy);
             _connector = null;
             _readBuf = null;
             _writeBuf = null;
diff --git a/test/Npgsql.Tests/BugTests.cs b/test/Npgsql.Tests/BugTests.cs
@@ -1,13 +1,14 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using NpgsqlTypes;
 using NUnit.Framework;
 using System.Transactions;
+using Npgsql.Tests.Support;
+
+using static Npgsql.Tests.TestUtil;
 
 namespace Npgsql.Tests
 {
@@ -116,6 +117,27 @@ public void Bug1645()
             Assert.That(conn.ExecuteScalar("SELECT COUNT(*) FROM data"), Is.Zero);
         }
 
+        [Test, IssueLink("https://github.com/npgsql/npgsql/issues/3600")]
+        public async Task Bug3600()
+        {
+            var csb = new NpgsqlConnectionStringBuilder(ConnectionString)
+            {
+                CommandTimeout = 1,
+            };
+            await using var postmasterMock = PgPostmasterMock.Start(csb.ConnectionString);
+            using var _ = CreateTempPool(postmasterMock.ConnectionString, out var connectionString);
+            await using var conn = await OpenConnectionAsync(connectionString);
+            var serverMock = await postmasterMock.WaitForServerConnection();
+            await serverMock
+                .WriteCopyInResponse()
+                .FlushAsync();
+            var ex = Assert.ThrowsAsync<NpgsqlException>(async () =>
+            {
+                await using var importer = await conn.BeginTextImportAsync($"COPY SomeTable (field_text, field_int4) FROM STDIN");
+            });
+            Assert.That(ex!.InnerException, Is.TypeOf<TimeoutException>());
+        }
+
         [Test, IssueLink("https://github.com/npgsql/npgsql/issues/1497")]
         public void Bug1497()
         {
diff --git a/test/Npgsql.Tests/Support/PgServerMock.cs b/test/Npgsql.Tests/Support/PgServerMock.cs
@@ -265,6 +265,17 @@ internal PgServerMock WriteBackendKeyData(int processId, int secret)
         internal PgServerMock WriteCancellationResponse()
             => WriteErrorResponse(PostgresErrorCodes.QueryCanceled, "Cancellation", "Query cancelled");
 
+        internal PgServerMock WriteCopyInResponse()
+        {
+            CheckDisposed();
+            _writeBuffer.WriteByte((byte)BackendMessageCode.CopyInResponse);
+            _writeBuffer.WriteInt32(5);
+            _writeBuffer.WriteByte(0);
+            _writeBuffer.WriteInt16(1);
+            _writeBuffer.WriteInt16(0);
+            return this;
+        }
+
         internal PgServerMock WriteErrorResponse(string code)
             => WriteErrorResponse(code, "ERROR", "MOCK ERROR MESSAGE");
 

Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ void Cleanup()`
`442`	`442`	`{`
`443`	`443`	`Log.Debug("COPY operation ended", _connector.Id);`
`444`	`444`	`_connector.CurrentCopyOperation = null;`
`445`		`- _connector.Connection!.EndBindingScope(ConnectorBindingScope.Copy);`
	`445`	`+ _connector.Connection?.EndBindingScope(ConnectorBindingScope.Copy);`
`446`	`446`	`_connector = null;`
`447`	`447`	`_readBuf = null;`
`448`	`448`	`_writeBuf = null;`