Fix misaligned buffer allocation method #1367

redis · Sep 4, 2020 · ec37e79 · ec37e79
1 parent ad1bac1
commit ec37e79
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/io/lettuce/core/codec/StringCodec.java b/src/main/java/io/lettuce/core/codec/StringCodec.java
@@ -196,9 +196,17 @@ public void encode(String str, ByteBuf target) {
     int sizeOf(String value, boolean estimate) {
 
         if (estimate) {
-            return (int) (averageBytesPerChar * value.length());
+            return (int) averageBytesPerChar * value.length();
         }
 
-        return (int) (maxBytesPerChar * value.length());
+        if (utf8) {
+            return ByteBufUtil.utf8MaxBytes(value);
+        }
+
+        if (ascii) {
+            return value.length();
+        }
+
+        return (int) maxBytesPerChar * value.length();
     }
 }
diff --git a/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java b/src/test/java/io/lettuce/core/codec/StringCodecUnitTests.java
@@ -24,6 +24,7 @@
 
 import io.lettuce.core.protocol.LettuceCharsets;
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufUtil;
 import io.netty.buffer.Unpooled;
 
 /**
@@ -125,7 +126,7 @@ void estimateSize() {
     void sizeOf() {
 
         assertThat(new StringCodec(StandardCharsets.UTF_8).sizeOf(teststring, false))
-            .isEqualTo(teststring.length() * 3);
+            .isEqualTo(ByteBufUtil.utf8MaxBytes(teststring));
         assertThat(new StringCodec(StandardCharsets.US_ASCII).sizeOf(teststring, false))
             .isEqualTo(teststring.length());
         assertThat(new StringCodec(StandardCharsets.ISO_8859_1).sizeOf(teststring, false))