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

Fix buffer leak introduced by 693633eeff106febf4403208f9eed2117931f45a

Browse Source 
Motivation:

As we not used Unpooled anymore for allocate buffers in Base64.* methods we need to ensure we realease all the buffers.

Modifications:

Correctly release buffers

Result:

No more buffer leaks
This commit is contained in:
Norman Maurer 2015-12-29 11:33:22 +01:00
parent 41945b2cab
commit 26ee81944e
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
handler/src/main/java/io/netty/handler/ssl/OpenSslContext.java
View File

@ -488,7 +488,9 @@ public abstract class OpenSslContext extends SslContext {
ByteBuf buffer = Unpooled.directBuffer(); ByteBuf buffer = Unpooled.directBuffer();
try { try {
buffer.writeBytes(BEGIN_PRIVATE_KEY); buffer.writeBytes(BEGIN_PRIVATE_KEY);
buffer.writeBytes(Base64.encode(Unpooled.wrappedBuffer(key.getEncoded()), true)); ByteBuf encoded = Base64.encode(Unpooled.wrappedBuffer(key.getEncoded()), true);
buffer.writeBytes(encoded);
encoded.release();
buffer.writeBytes(END_PRIVATE_KEY); buffer.writeBytes(END_PRIVATE_KEY);
return newBIO(buffer); return newBIO(buffer);
} finally { } finally {
@ -508,7 +510,9 @@ public abstract class OpenSslContext extends SslContext {
try { try {
for (X509Certificate cert: certChain) { for (X509Certificate cert: certChain) {
buffer.writeBytes(BEGIN_CERT); buffer.writeBytes(BEGIN_CERT);
buffer.writeBytes(Base64.encode(Unpooled.wrappedBuffer(cert.getEncoded()), true)); ByteBuf encoded = Base64.encode(Unpooled.wrappedBuffer(cert.getEncoded()), true);
buffer.writeBytes(encoded);
encoded.release();
buffer.writeBytes(END_CERT); buffer.writeBytes(END_CERT);
} }
return newBIO(buffer); return newBIO(buffer);

11
handler/src/main/java/io/netty/handler/ssl/util/SelfSignedCertificate.java
View File

@ -16,6 +16,7 @@
package io.netty.handler.ssl.util; package io.netty.handler.ssl.util;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.handler.codec.base64.Base64; import io.netty.handler.codec.base64.Base64;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
@ -217,11 +218,11 @@ public final class SelfSignedCertificate {
static String[] newSelfSignedCertificate( static String[] newSelfSignedCertificate(
String fqdn, PrivateKey key, X509Certificate cert) throws IOException, CertificateEncodingException { String fqdn, PrivateKey key, X509Certificate cert) throws IOException, CertificateEncodingException {
// Encode the private key into a file. // Encode the private key into a file.
String keyText = "-----BEGIN PRIVATE KEY-----\n" + ByteBuf enc = Base64.encode(Unpooled.wrappedBuffer(key.getEncoded()), true);
Base64.encode(Unpooled.wrappedBuffer(key.getEncoded()), true).toString(CharsetUtil.US_ASCII) + String keyText = "-----BEGIN PRIVATE KEY-----\n" + enc.toString(CharsetUtil.US_ASCII) +
"\n-----END PRIVATE KEY-----\n"; "\n-----END PRIVATE KEY-----\n";
enc.release();
File keyFile = File.createTempFile("keyutil_" + fqdn + '_', ".key"); File keyFile = File.createTempFile("keyutil_" + fqdn + '_', ".key");
keyFile.deleteOnExit(); keyFile.deleteOnExit();
@ -238,10 +239,12 @@ public final class SelfSignedCertificate {
} }
} }
ByteBuf encoded = Base64.encode(Unpooled.wrappedBuffer(cert.getEncoded()), true);
// Encode the certificate into a CRT file. // Encode the certificate into a CRT file.
String certText = "-----BEGIN CERTIFICATE-----\n" + String certText = "-----BEGIN CERTIFICATE-----\n" +
Base64.encode(Unpooled.wrappedBuffer(cert.getEncoded()), true).toString(CharsetUtil.US_ASCII) + encoded.toString(CharsetUtil.US_ASCII) +
"\n-----END CERTIFICATE-----\n"; "\n-----END CERTIFICATE-----\n";
encoded.release();
File certFile = File.createTempFile("keyutil_" + fqdn + '_', ".crt"); File certFile = File.createTempFile("keyutil_" + fqdn + '_', ".crt");
certFile.deleteOnExit(); certFile.deleteOnExit();