Ensure required bytes when reading Polygon types (#4831)

manandre · web-flow · commit 68a63a831904 · 2022-12-22T09:32:33.000+01:00
diff --git a/src/Npgsql.GeoJSON/Internal/GeoJSONHandler.cs b/src/Npgsql.GeoJSON/Internal/GeoJSONHandler.cs
@@ -167,6 +167,7 @@ async ValueTask<GeoJSONObject> ReadGeometryCore(NpgsqlReadBuffer buf, bool async
             var lines = new LineString[buf.ReadInt32(littleEndian)];
             for (var i = 0; i < lines.Length; ++i)
             {
+                await buf.Ensure(SizeOfLength, async);
                 var coordinates = new Position[buf.ReadInt32(littleEndian)];
                 for (var j = 0; j < coordinates.Length; ++j)
                 {
@@ -230,6 +231,7 @@ async ValueTask<GeoJSONObject> ReadGeometryCore(NpgsqlReadBuffer buf, bool async
                 var lines = new LineString[buf.ReadInt32(littleEndian)];
                 for (var j = 0; j < lines.Length; ++j)
                 {
+                    await buf.Ensure(SizeOfLength, async);
                     var coordinates = new Position[buf.ReadInt32(littleEndian)];
                     for (var k = 0; k < coordinates.Length; ++k)
                     {
@@ -498,7 +500,7 @@ public async Task Write(Polygon value, NpgsqlWriteBuffer buf, NpgsqlLengthCache?
 
         for (var i = 0; i < lines.Count; ++i)
         {
-            if (buf.WriteSpaceLeft < 4)
+            if (buf.WriteSpaceLeft < SizeOfLength)
                 await buf.Flush(async, cancellationToken);
             var coordinates = lines[i].Coordinates;
             buf.WriteInt32(coordinates.Count);
diff --git a/test/Npgsql.PluginTests/GeoJSONTests.cs b/test/Npgsql.PluginTests/GeoJSONTests.cs
@@ -346,6 +346,68 @@ public async Task Import_big_geometry()
         Assert.That(actual, Is.EqualTo(geometry));
     }
 
+    [Test, TestCaseSource(nameof(Tests))]
+    public async Task Export_geometry(TestData data)
+    {
+        await using var conn = await OpenConnectionAsync(options: GeoJSONOptions.BoundingBox);
+        var table = await CreateTempTable(conn, "field geometry");
+
+        await using (var writer = await conn.BeginBinaryImportAsync($"COPY {table} (field) FROM STDIN BINARY"))
+        {
+            await writer.StartRowAsync();
+            await writer.WriteAsync(data.Geometry, NpgsqlDbType.Geometry);
+
+            var rowsWritten = await writer.CompleteAsync();
+            Assert.That(rowsWritten, Is.EqualTo(1));
+        }
+
+        await using (var reader = await conn.BeginBinaryExportAsync($"COPY {table} (field) TO STDOUT BINARY"))
+        {
+            await reader.StartRowAsync();
+            var field = await reader.ReadAsync<GeoJSONObject>(NpgsqlDbType.Geometry);
+            Assert.That(field, Is.EqualTo(data.Geometry));
+        }
+    }
+
+    [Test, IssueLink("https://github.com/npgsql/npgsql/issues/4830")]
+    public async Task Export_big_geometry()
+    {
+        await using var conn = await OpenConnectionAsync();
+        var table = await CreateTempTable(conn, "id text, field geometry");
+
+        var geometry = new Polygon(new[] {
+            new LineString(
+                Enumerable.Range(1, 507)
+                    .Select(i => new Position(longitude: i, latitude: i))
+                    .Append(new Position(longitude: 1d, latitude: 1d))),
+            new LineString(new[] {
+                new Position(longitude: 1d, latitude: 1d),
+                new Position(longitude: 1d, latitude: 2d),
+                new Position(longitude: 1d, latitude: 3d),
+                new Position(longitude: 1d, latitude: 1d),
+            })
+        });
+
+        await using (var writer = await conn.BeginBinaryImportAsync($"COPY {table} (id, field) FROM STDIN BINARY"))
+        {
+            await writer.StartRowAsync();
+            await writer.WriteAsync("aaaa", NpgsqlDbType.Text);
+            await writer.WriteAsync(geometry, NpgsqlDbType.Geometry);
+
+            var rowsWritten = await writer.CompleteAsync();
+            Assert.That(rowsWritten, Is.EqualTo(1));
+        }
+
+        await using (var reader = await conn.BeginBinaryExportAsync($"COPY {table} (id, field) TO STDOUT BINARY"))
+        {
+            await reader.StartRowAsync();
+            var id = await reader.ReadAsync<string>();
+            var field = await reader.ReadAsync<GeoJSONObject>(NpgsqlDbType.Geometry);
+            Assert.That(id, Is.EqualTo("aaaa"));
+            Assert.That(field, Is.EqualTo(geometry));
+        }
+    }
+
     ValueTask<NpgsqlConnection> OpenConnectionAsync(GeoJSONOptions options = GeoJSONOptions.None)
         => GetDataSource(options).OpenConnectionAsync();
 

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ async ValueTask<GeoJSONObject> ReadGeometryCore(NpgsqlReadBuffer buf, bool async`
`167`	`167`	`var lines = new LineString[buf.ReadInt32(littleEndian)];`
`168`	`168`	`for (var i = 0; i < lines.Length; ++i)`
`169`	`169`	`{`
	`170`	`+ await buf.Ensure(SizeOfLength, async);`
`170`	`171`	`var coordinates = new Position[buf.ReadInt32(littleEndian)];`
`171`	`172`	`for (var j = 0; j < coordinates.Length; ++j)`
`172`	`173`	`{`
`@@ -230,6 +231,7 @@ async ValueTask<GeoJSONObject> ReadGeometryCore(NpgsqlReadBuffer buf, bool async`
`230`	`231`	`var lines = new LineString[buf.ReadInt32(littleEndian)];`
`231`	`232`	`for (var j = 0; j < lines.Length; ++j)`
`232`	`233`	`{`
	`234`	`+ await buf.Ensure(SizeOfLength, async);`
`233`	`235`	`var coordinates = new Position[buf.ReadInt32(littleEndian)];`
`234`	`236`	`for (var k = 0; k < coordinates.Length; ++k)`
`235`	`237`	`{`
`@@ -498,7 +500,7 @@ public async Task Write(Polygon value, NpgsqlWriteBuffer buf, NpgsqlLengthCache?`
`498`	`500`
`499`	`501`	`for (var i = 0; i < lines.Count; ++i)`
`500`	`502`	`{`
`501`		`- if (buf.WriteSpaceLeft < 4)`
	`503`	`+ if (buf.WriteSpaceLeft < SizeOfLength)`
`502`	`504`	`await buf.Flush(async, cancellationToken);`
`503`	`505`	`var coordinates = lines[i].Coordinates;`
`504`	`506`	`buf.WriteInt32(coordinates.Count);`