Guard ToByteBufEncoder calls with try/finally #930

Lettuce now makes sure to properly release temporary buffers after encoding keys and values. This avoids memory leaks caused by encoding errors.
redis · Nov 24, 2018 · 14db4fa · 14db4fa
1 parent ec2899c
commit 14db4fa
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandArgs.java b/src/main/java/io/lettuce/core/protocol/CommandArgs.java
@@ -654,10 +654,14 @@ void encode(ByteBuf target) {
 
                 ToByteBufEncoder<K, V> toByteBufEncoder = (ToByteBufEncoder<K, V>) codec;
                 ByteBuf temporaryBuffer = target.alloc().buffer(toByteBufEncoder.estimateSize(key) + 6);
-                toByteBufEncoder.encodeKey(key, temporaryBuffer);
 
-                ByteBufferArgument.writeByteBuf(target, temporaryBuffer);
-                temporaryBuffer.release();
+                try {
+
+                    toByteBufEncoder.encodeKey(key, temporaryBuffer);
+                    ByteBufferArgument.writeByteBuf(target, temporaryBuffer);
+                } finally {
+                    temporaryBuffer.release();
+                }
 
                 return;
             }
@@ -693,10 +697,13 @@ void encode(ByteBuf target) {
 
                 ToByteBufEncoder<K, V> toByteBufEncoder = (ToByteBufEncoder<K, V>) codec;
                 ByteBuf temporaryBuffer = target.alloc().buffer(toByteBufEncoder.estimateSize(val) + 6);
-                toByteBufEncoder.encodeValue(val, temporaryBuffer);
 
-                ByteBufferArgument.writeByteBuf(target, temporaryBuffer);
-                temporaryBuffer.release();
+                try {
+                    toByteBufEncoder.encodeValue(val, temporaryBuffer);
+                    ByteBufferArgument.writeByteBuf(target, temporaryBuffer);
+                } finally {
+                    temporaryBuffer.release();
+                }
 
                 return;
             }