Fixes #6107 missed should buffer in biginteger numeric converter (#6117)

NinoFloris · NinoFloris · commit 7a007d9d0fcb · 2025-06-01T12:51:38.000+02:00
(cherry picked from commit 892774f)
diff --git a/src/Npgsql/Internal/Converters/Primitive/NumericConverters.cs b/src/Npgsql/Internal/Converters/Primitive/NumericConverters.cs
@@ -13,6 +13,9 @@ sealed class BigIntegerNumericConverter : PgStreamingConverter<BigInteger>
 
     public override BigInteger Read(PgReader reader)
     {
+        if (reader.ShouldBuffer(sizeof(short)))
+            reader.Buffer(sizeof(short));
+
         var digitCount = reader.ReadInt16();
         short[]? digitsFromPool = null;
         var digits = (digitCount <= StackAllocByteThreshold / sizeof(short)
@@ -37,7 +40,9 @@ public override ValueTask<BigInteger> ReadAsync(PgReader reader, CancellationTok
 
         static async ValueTask<BigInteger> AsyncCore(PgReader reader, CancellationToken cancellationToken)
         {
-            await reader.BufferAsync(PgNumeric.GetByteCount(0), cancellationToken).ConfigureAwait(false);
+            if (reader.ShouldBuffer(sizeof(short)))
+                await reader.BufferAsync(sizeof(short), cancellationToken).ConfigureAwait(false);
+
             var digitCount = reader.ReadInt16();
             var digits = new ArraySegment<short>(ArrayPool<short>.Shared.Rent(digitCount), 0, digitCount);
             var value = ConvertTo(await NumericConverter.ReadAsync(reader, digits, cancellationToken).ConfigureAwait(false));
@@ -187,7 +192,7 @@ static T ConvertTo(in PgNumeric.Builder numeric)
 
 static class NumericConverter
 {
-    public static int DecimalBasedMaxByteCount = PgNumeric.GetByteCount(PgNumeric.Builder.MaxDecimalNumericDigits);
+    public static readonly int DecimalBasedMaxByteCount = PgNumeric.GetByteCount(PgNumeric.Builder.MaxDecimalNumericDigits);
 
     public static PgNumeric.Builder Read(PgReader reader, Span<short> digits)
     {

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@ sealed class BigIntegerNumericConverter : PgStreamingConverter<BigInteger>`
`13`	`13`
`14`	`14`	`public override BigInteger Read(PgReader reader)`
`15`	`15`	`{`
	`16`	`+ if (reader.ShouldBuffer(sizeof(short)))`
	`17`	`+ reader.Buffer(sizeof(short));`
	`18`	`+`
`16`	`19`	`var digitCount = reader.ReadInt16();`
`17`	`20`	`short[]? digitsFromPool = null;`
`18`	`21`	`var digits = (digitCount <= StackAllocByteThreshold / sizeof(short)`
`@@ -37,7 +40,9 @@ public override ValueTask<BigInteger> ReadAsync(PgReader reader, CancellationTok`
`37`	`40`
`38`	`41`	`static async ValueTask<BigInteger> AsyncCore(PgReader reader, CancellationToken cancellationToken)`
`39`	`42`	`{`
`40`		`- await reader.BufferAsync(PgNumeric.GetByteCount(0), cancellationToken).ConfigureAwait(false);`
	`43`	`+ if (reader.ShouldBuffer(sizeof(short)))`
	`44`	`+ await reader.BufferAsync(sizeof(short), cancellationToken).ConfigureAwait(false);`
	`45`	`+`
`41`	`46`	`var digitCount = reader.ReadInt16();`
`42`	`47`	`var digits = new ArraySegment<short>(ArrayPool<short>.Shared.Rent(digitCount), 0, digitCount);`
`43`	`48`	`var value = ConvertTo(await NumericConverter.ReadAsync(reader, digits, cancellationToken).ConfigureAwait(false));`
`@@ -187,7 +192,7 @@ static T ConvertTo(in PgNumeric.Builder numeric)`
`187`	`192`
`188`	`193`	`static class NumericConverter`
`189`	`194`	`{`
`190`		`- public static int DecimalBasedMaxByteCount = PgNumeric.GetByteCount(PgNumeric.Builder.MaxDecimalNumericDigits);`
	`195`	`+ public static readonly int DecimalBasedMaxByteCount = PgNumeric.GetByteCount(PgNumeric.Builder.MaxDecimalNumericDigits);`
`191`	`196`
`192`	`197`	`public static PgNumeric.Builder Read(PgReader reader, Span<short> digits)`
`193`	`198`	`{`