Issue #12695 - reject attempts to memory map files from FileSystems t…

…hat do not support it.
jetty · Jan 9, 2025 · d1a8929 · d1a8929
1 parent 308cdf4
commit d1a8929
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/...etty-http/src/main/java/org/eclipse/jetty/http/content/FileMappingHttpContentFactory.java b/...etty-http/src/main/java/org/eclipse/jetty/http/content/FileMappingHttpContentFactory.java
@@ -101,6 +101,8 @@ private SingleBufferFileMappedHttpContent(HttpContent content) throws IOExceptio
             if (path == null)
                 throw new IOException("Cannot memory map Content whose Resource is not backed by a Path: " + content.getResource());
             _buffer = BufferUtil.toMappedBuffer(path);
+            if (_buffer == null)
+                throw new IOException("Cannot memory map Content (not supported by underlying FileSystem): " + content.getResource());
             _contentLength = new HttpField(HttpHeader.CONTENT_LENGTH, Integer.toString(_buffer.remaining()));
             _lastModified = content.getLastModified();
             _lastModifiedInstant = content.getLastModifiedInstant();
@@ -176,6 +178,8 @@ private MultiBufferFileMappedHttpContent(HttpContent content, int maxBufferSize)
             {
                 long len = Math.min(contentLength - currentPos, maxBufferSize);
                 _buffers[i] = BufferUtil.toMappedBuffer(path, currentPos, len);
+                if (_buffers[i] == null)
+                    throw new IOException("Cannot memory map Content (not supported by underlying FileSystem): " + content.getResource());
                 currentPos += len;
                 total += _buffers[i].remaining();
             }

diff --git a/...ty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/FileBufferedResponseHandler.java b/...ty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/FileBufferedResponseHandler.java
@@ -208,6 +208,8 @@ protected Action process() throws Exception
                     long len = Math.min(MAX_MAPPED_BUFFER_SIZE, fileLength - _pos);
                     _last = (_pos + len == fileLength);
                     ByteBuffer buffer = BufferUtil.toMappedBuffer(_filePath, _pos, len);
+                    if (buffer == null)
+                        throw new IOException("Cannot memory map file (not supported by underlying FileSystem): " + _filePath.toUri());
                     getNextInterceptor().write(buffer, _last, this);
                     _pos += len;
                     return Action.SCHEDULED;