From c4c0b284c4492515443a89106ac9b52188bbc270 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Mon, 22 Apr 2024 16:57:40 +0200
Subject: [PATCH] [MINOR UPDATE] update to netty 4.1.109 due to CVE-2024-29025
 (#2904)

---
 .../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 d5f4ee3e35f..52251398d85 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 InnerAllocator() {
             e);
       }
 
-      this.chunkSize = directArenas[0].chunkSize;
+      this.chunkSize = directArenas[0].sizeClass.chunkSize;
 
       if (memoryLogger.isTraceEnabled()) {
         statusThread = new MemoryStatusThread();
@@ -166,7 +166,7 @@ private UnsafeDirectLittleEndian newDirectBufferL(int initialCapacity, int maxCa
 
       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 1b48ce63c87..957679eff50 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>