Do not throw from HttpChannelState.read() method (#11369)

Fixes #11363 by ensuring that read never throws, but instead returns an Error chunk.
jetty · Feb 19, 2024 · b89c7eb · b89c7eb
1 parent 3d36825
commit b89c7eb
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/...y-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java b/...y-core/jetty-server/src/main/java/org/eclipse/jetty/server/internal/HttpChannelState.java
@@ -867,31 +867,37 @@ public long getLength()
         @Override
         public Content.Chunk read()
         {
-            HttpStream stream;
-            try (AutoLock ignored = _lock.lock())
+            try
             {
-                HttpChannelState httpChannel = lockedGetHttpChannelState();
-
-                Content.Chunk error = httpChannel._readFailure;
-                httpChannel._readFailure = Content.Chunk.next(error);
-                if (error != null)
-                    return error;
+                HttpStream stream;
+                try (AutoLock ignored = _lock.lock())
+                {
+                    HttpChannelState httpChannel = lockedGetHttpChannelState();
 
-                stream = httpChannel._stream;
-            }
+                    Content.Chunk error = httpChannel._readFailure;
+                    httpChannel._readFailure = Content.Chunk.next(error);
+                    if (error != null)
+                        return error;
 
-            Content.Chunk chunk = stream.read();
+                    stream = httpChannel._stream;
+                }
+                Content.Chunk chunk = stream.read();
 
-            if (LOG.isDebugEnabled())
-                LOG.debug("read {}", chunk);
+                if (LOG.isDebugEnabled())
+                    LOG.debug("read {}", chunk);
 
-            if (chunk != null && chunk.hasRemaining())
-                _contentBytesRead.add(chunk.getByteBuffer().remaining());
+                if (chunk != null && chunk.hasRemaining())
+                    _contentBytesRead.add(chunk.getByteBuffer().remaining());
 
-            if (chunk instanceof Trailers trailers)
-                _trailers = trailers.getTrailers();
+                if (chunk instanceof Trailers trailers)
+                    _trailers = trailers.getTrailers();
 
-            return chunk;
+                return chunk;
+            }
+            catch (Throwable t)
+            {
+                return Content.Chunk.from(t, true);
+            }
         }
 
         @Override