[UNDERTOW-2252] Potential fix for the SslConduit.dataToUnwrap buffer …

…leak Signed-off-by: Flavia Rainone <[email protected]>
undertow-io · Mar 26, 2023 · f0a0f24 · f0a0f24
1 parent 1302c8c
commit f0a0f24
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/core/src/main/java/io/undertow/protocols/ssl/SslConduit.java b/core/src/main/java/io/undertow/protocols/ssl/SslConduit.java
@@ -1276,14 +1276,16 @@ public void readReady() {
             }
             if(anyAreSet(state, FLAG_READS_RESUMED) && (unwrappedData != null || anyAreSet(state, FLAG_DATA_TO_UNWRAP))) {
                 if(anyAreSet(state, FLAG_READ_CLOSED)) {
-                    if(unwrappedData != null) {
-                        unwrappedData.close();
-                    }
-                    if(dataToUnwrap != null) {
-                        dataToUnwrap.close();
+                    synchronized (SslConduit.this) {
+                        if (unwrappedData != null) {
+                            unwrappedData.close();
+                        }
+                        if (dataToUnwrap != null) {
+                            dataToUnwrap.close();
+                        }
+                        unwrappedData = null;
+                        dataToUnwrap = null;
                     }
-                    unwrappedData = null;
-                    dataToUnwrap = null;
                 } else {
                     //there is data in the buffers so we do a wakeup
                     //as we may not get an actual read notification