#10537 make sure ByteBuffers given to feedClearBytesForStream() don't make JNA choke

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2023-10-18 19:22:41 +02:00
parent 78f3b5c9fb
commit 8cfd20b164
1 changed files with 30 additions and 1 deletions

View File

@ -690,7 +690,7 @@ public class JnaQuicheConnection extends QuicheConnection
{ {
if (quicheConn == null) if (quicheConn == null)
throw new IOException("connection was released"); 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) if (written == quiche_error.QUICHE_ERR_DONE)
return 0; return 0;
if (written < 0L) 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 <code>"Buffer arguments
* must be direct or have a primitive backing array"</code> from this native
* method in <code>dispatch.c:615</code>:
* <pre>
* static void
* dispatch(JNIEnv *env, void* func, jint flags, jobjectArray args,
* ffi_type *return_type, void *presult)
* </pre>
* 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 @Override
public int drainClearBytesForStream(long streamId, ByteBuffer buffer) throws IOException public int drainClearBytesForStream(long streamId, ByteBuffer buffer) throws IOException
{ {