...

Author: andersstorhaug

Lite3DotNet.SystemTextJson/Lite3JsonDecoder.cs

@@ -206,9 +206,6 @@ private static (byte[] Buffer, int Position) DecodeImpl(
                     break;
                 }
 
-                if (readerBuffer.Length > MaxReadBufferSize)
-                    throw new InvalidDataException("JSON token exceeds maximum buffer size.");
-
                 var jsonReader = new Utf8JsonReader(readerBuffer, isCompleted, readerState);
 
                 var status = DecodeCore(
@@ -222,11 +219,16 @@ private static (byte[] Buffer, int Position) DecodeImpl(
 
                 switch (status)
                 {
-                    case Lite3Core.Status.NeedsMoreData:
-                        if (jsonReader.BytesConsumed == 0)
-                            targetReadSize = targetReadSize >= MaxReadBufferSize / 2
-                                ? MaxReadBufferSize
-                                : targetReadSize * 2;
+                    case Lite3Core.Status.NeedsMoreData when !isCompleted:
+                        if (jsonReader.BytesConsumed > 0)
+                            break;
+                        
+                        if (targetReadSize >= MaxReadBufferSize)
+                            throw new InvalidDataException("Input requires buffering more than the maximum allowed size.");
+                        
+                        targetReadSize = targetReadSize >= MaxReadBufferSize / 2
+                            ? MaxReadBufferSize
+                            : targetReadSize * 2;
                         break;
 
                     case < 0:
@@ -263,8 +265,6 @@ private static (byte[] Buffer, int Position) DecodeImpl(
         finally
         {
             ArrayPool<Frame>.Shared.Return(frames);
-            
-            await pipeReader.CompleteAsync().ConfigureAwait(false);
         }
 
         return (buffer, position);
@@ -330,7 +330,7 @@ private static Lite3Core.Status DecodeDocument(
         Lite3Core.Status status;
 
         if (!reader.Read())
-            return reader.IsFinalBlock ? Lite3Core.Status.InsufficientBuffer : Lite3Core.Status.NeedsMoreData;
+            return Lite3Core.Status.NeedsMoreData;
 
         switch (reader.TokenType)
         {
@@ -377,7 +377,7 @@ private static Lite3Core.Status DecodeObject(
             return stack.Push(Frame.ForObjectSwitch(offset, GetKeyRef(arrayPool, ref reader)));
         }
 
-        return reader.IsFinalBlock ? Lite3Core.Status.InsufficientBuffer : Lite3Core.Status.NeedsMoreData;
+        return Lite3Core.Status.NeedsMoreData;
     }
 
     private static Lite3Core.Status DecodeObjectSwitch(
@@ -485,7 +485,7 @@ private static Lite3Core.Status DecodeArray(
             return stack.Push(Frame.ForArraySwitch(offset));
         }
 
-        return reader.IsFinalBlock ? Lite3Core.Status.InsufficientBuffer : Lite3Core.Status.NeedsMoreData;
+        return Lite3Core.Status.NeedsMoreData;
     }
 
     private static Lite3Core.Status DecodeArraySwitch(
@@ -626,7 +626,7 @@ private struct FrameStack(Frame[] frames)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Lite3Core.Status Push(in Frame frame)
         {
-            if (_index > _frames.Length - 1) return Lite3Core.Status.JsonNestingDepthExceededMax;
+            if (_index >= _frames.Length - 1) return Lite3Core.Status.JsonNestingDepthExceededMax;
             _frames[++_index] = frame;
             return 0;
         }

Lite3DotNet/Lite3Core.Status.cs

@@ -29,7 +29,6 @@ public enum Status
         ExpectedJsonValue,
         InsufficientBuffer,
         NeedsMoreData,
-        BufferOverflow,
 
         None = 0,
         IteratorDone = 1,
@@ -63,8 +62,7 @@ public enum Status
         Status.ExpectedJsonArrayOrObject => new InvalidOperationException("Expected JSON array or object."),
         Status.ExpectedJsonValue => new InvalidOperationException("Expected JSON value."),
         Status.JsonNestingDepthExceededMax => new InvalidOperationException("JSON nesting depth exceeded max."),
-        Status.NeedsMoreData => new InvalidOperationException("Needs more data."),
-        Status.BufferOverflow => new InvalidOperationException("Buffer overflow."),
+        Status.NeedsMoreData => new InvalidOperationException("Unexpected end of input."),
 
         _ => new InvalidOperationException($"An unknown error occurred ({status}).")
     };