Fix tests

cincuranet · Nov 7, 2024 · f8b8049 · f8b8049
1 parent 8a864c8
commit f8b8049
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesBlob.cs b/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesBlob.cs
@@ -220,7 +220,6 @@ public override void GetSegment(Stream stream)
 			requested,
 			tmp);
 
-
 		RblRemoveValue(IscCodes.RBL_segment);
 
 		if (_statusVector[1] == new IntPtr(IscCodes.isc_segstr_eof))
@@ -317,7 +316,15 @@ public override byte[] GetSegment()
 			_database.ProcessStatusVector(_statusVector);
 		}
 
-		return tmp;
+		var actualSegment = tmp;
+		if (actualSegment.Length != segmentLength)
+		{
+			tmp = new byte[segmentLength];
+			Array.Copy(actualSegment, tmp, segmentLength);
+			actualSegment = tmp;
+		}
+
+		return actualSegment;
 	}
 	public override ValueTask<byte[]> GetSegmentAsync(CancellationToken cancellationToken = default)
 	{
@@ -355,7 +362,15 @@ public override ValueTask<byte[]> GetSegmentAsync(CancellationToken cancellation
 			}
 		}
 
-		return ValueTask2.FromResult(tmp);
+		var actualSegment = tmp;
+		if (actualSegment.Length != segmentLength)
+		{
+			tmp = new byte[segmentLength];
+			Array.Copy(actualSegment, tmp, segmentLength);
+			actualSegment = tmp;
+		}
+
+		return ValueTask2.FromResult(actualSegment);
 	}
 
 	public override void PutSegment(byte[] buffer)

diff --git a/src/FirebirdSql.Data.FirebirdClient/Common/BlobStream.cs b/src/FirebirdSql.Data.FirebirdClient/Common/BlobStream.cs
@@ -27,7 +27,16 @@ public override long Position
 		set => Seek(value, SeekOrigin.Begin);
 	}
 
-	public override long Length => _blobHandle.GetLength();
+	public override long Length
+	{
+		get
+		{
+			if (!_blobHandle.IsOpen)
+				_blobHandle.Open();
+
+			return _blobHandle.GetLength();
+		}
+	}
 
 	public override void Flush()
 	{