add some fixes to SizeLimitHandler

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Nov 9, 2022 · ec197a2 · ec197a2 · AN3Orik · Jun 9, 2023
1 parent 4dc81ad
commit ec197a2
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/SizeLimitHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/SizeLimitHandler.java
@@ -126,6 +126,9 @@ public boolean isOptimizedForDirectBuffers()
         @Override
         public HttpInput.Content readFrom(HttpInput.Content content)
         {
+            if (content == null)
+                return null;
+
             if (content.hasContent())
             {
                 _read += content.remaining();
@@ -140,7 +143,16 @@ public void write(ByteBuffer content, boolean last, Callback callback)
             if (content.hasRemaining())
             {
                 _written += content.remaining();
-                checkResponseLimit(_written);
+
+                try
+                {
+                    checkResponseLimit(_written);
+                }
+                catch (Throwable t)
+                {
+                    callback.failed(t);
+                    return;
+                }
             }
             getNextInterceptor().write(content, last, callback);
         }