andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix memory leak in DefaultCompositeByteBuf when a component is another CompositeByteBuf

Browse Source
This commit is contained in:
Trustin Lee 2013-03-14 16:06:38 +09:00
parent 70a51bcd8d
commit 60d9984db1
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
buffer/src/main/java/io/netty/buffer/DefaultCompositeByteBuf.java
View File

@ -204,6 +204,8 @@ public class DefaultCompositeByteBuf extends AbstractReferenceCountedByteBuf
if (cIndex > size) { if (cIndex > size) {
cIndex = size; cIndex = size;
} }
} else {
b.release();
} }
} }
return cIndex; return cIndex;
@ -222,11 +224,19 @@ public class DefaultCompositeByteBuf extends AbstractReferenceCountedByteBuf
} }
if (buffers instanceof DefaultCompositeByteBuf) { if (buffers instanceof DefaultCompositeByteBuf) {
List<Component> list = ((DefaultCompositeByteBuf) buffers).components; DefaultCompositeByteBuf compositeBuf = (DefaultCompositeByteBuf) buffers;
List<Component> list = compositeBuf.components;
ByteBuf[] array = new ByteBuf[list.size()]; ByteBuf[] array = new ByteBuf[list.size()];
for (int i = 0; i < array.length; i ++) { for (int i = 0; i < array.length; i ++) {
array[i] = list.get(i).buf; ByteBuf slice = list.get(i).buf;
ByteBuf buf;
for (buf = slice; buf.unwrap() != null; buf = buf.unwrap()) {
continue;
}
buf.retain();
array[i] = slice;
} }
compositeBuf.release();
return addComponents0(cIndex, array); return addComponents0(cIndex, array);
} }