From 8cfd20b1642eb7c94564611b01f46350b508a6c0 Mon Sep 17 00:00:00 2001 From: Ludovic Orban Date: Wed, 18 Oct 2023 19:22:41 +0200 Subject: [PATCH] #10537 make sure ByteBuffers given to feedClearBytesForStream() don't make JNA choke Signed-off-by: Ludovic Orban --- .../quic/quiche/jna/JnaQuicheConnection.java | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/JnaQuicheConnection.java b/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/JnaQuicheConnection.java index ca150fe7695..5a4f980df8a 100644 --- a/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/JnaQuicheConnection.java +++ b/jetty-quic/quic-quiche/quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/JnaQuicheConnection.java @@ -690,7 +690,7 @@ public class JnaQuicheConnection extends QuicheConnection { if (quicheConn == null) throw new IOException("connection was released"); - int written = LibQuiche.INSTANCE.quiche_conn_stream_send(quicheConn, new uint64_t(streamId), buffer, new size_t(buffer.remaining()), last).intValue(); + int written = LibQuiche.INSTANCE.quiche_conn_stream_send(quicheConn, new uint64_t(streamId), jnaBuffer(buffer), new size_t(buffer.remaining()), last).intValue(); if (written == quiche_error.QUICHE_ERR_DONE) return 0; if (written < 0L) @@ -700,6 +700,35 @@ public class JnaQuicheConnection extends QuicheConnection } } + /** + * JNA requires ByteBuffers that are either direct or backed by an array. + * Read-only heap buffer are not direct and are considered not backed by an + * array, so buffer.hasArray() returns false for then an JNA rejects them + * by throwing IllegalStateException with the message "Buffer arguments + * must be direct or have a primitive backing array" from this native + * method in dispatch.c:615: + *
+     * static void
+     * dispatch(JNIEnv *env, void* func, jint flags, jobjectArray args,
+     *          ffi_type *return_type, void *presult)
+     * 
+ * so this method ensures the buffer fulfils JNA's conditions, or it copies + * the given buffer into a new heap buffer and returns the copy, while also + * keeping the limit and position of the original buffer and setting them + * on the new buffer in a way comparable to the original buffer's. + */ + private static ByteBuffer jnaBuffer(ByteBuffer buffer) + { + if (buffer.isDirect() || buffer.hasArray()) + return buffer; + ByteBuffer jnaBuffer = ByteBuffer.allocate(buffer.remaining()); + int oldPosition = buffer.position(); + jnaBuffer.put(buffer); + jnaBuffer.flip(); + buffer.position(oldPosition); + return jnaBuffer; + } + @Override public int drainClearBytesForStream(long streamId, ByteBuffer buffer) throws IOException {