This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new c4c0b284c4 [MINOR UPDATE] update to netty 4.1.109 due to
CVE-2024-29025 (#2904)
c4c0b284c4 is described below
commit c4c0b284c4492515443a89106ac9b52188bbc270
Author: PJ Fanning <[email protected]>
AuthorDate: Mon Apr 22 16:57:40 2024 +0200
[MINOR UPDATE] update to netty 4.1.109 due to CVE-2024-29025 (#2904)
---
.../base/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java | 4 ++--
pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/exec/memory/base/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
b/exec/memory/base/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
index d5f4ee3e35..52251398d8 100644
---
a/exec/memory/base/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
+++
b/exec/memory/base/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
@@ -109,7 +109,7 @@ public class PooledByteBufAllocatorL {
e);
}
- this.chunkSize = directArenas[0].chunkSize;
+ this.chunkSize = directArenas[0].sizeClass.chunkSize;
if (memoryLogger.isTraceEnabled()) {
statusThread = new MemoryStatusThread();
@@ -166,7 +166,7 @@ public class PooledByteBufAllocatorL {
if (directArena != null) {
- if (initialCapacity > directArena.chunkSize) {
+ if (initialCapacity > directArena.sizeClass.chunkSize) {
// This is beyond chunk size so we'll allocate separately.
ByteBuf buf = UnpooledByteBufAllocator.DEFAULT
.directBuffer(initialCapacity, maxCapacity);
diff --git a/pom.xml b/pom.xml
index 1b48ce63c8..957679eff5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,8 +122,8 @@
<mongo.version>4.11.1</mongo.version>
<msgpack.version>0.6.6</msgpack.version>
<netty.tcnative.classifier />
- <netty.tcnative.version>2.0.62.Final</netty.tcnative.version>
- <netty.version>4.1.101.Final</netty.version>
+ <netty.tcnative.version>2.0.65.Final</netty.tcnative.version>
+ <netty.version>4.1.109.Final</netty.version>
<parquet.format.version>2.9.0</parquet.format.version>
<parquet.version>1.12.3</parquet.version>
<project.build.outputTimestamp>1676438963</project.build.outputTimestamp>
