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

Fix a potential fd leak in AbstractDiskHttpData.getChunk (#10270)

Browse Source 
Motivation:

`FileChannel.read()` may throw an IOException. We must deal with this in case of the occurrence of `I/O` error.

Modification:

Place the `FileChannel.read()` method call in the `try-finally` block.

Result:

Advoid fd leak.


Co-authored-by: Norman Maurer <norman_maurer@apple.com>
This commit is contained in:
prgitpr 2020-05-14 16:16:16 +08:00 committed by GitHub
parent 9411f2a434
commit 2183b37892
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
codec-http/src/main/java/io/netty/handler/codec/http/multipart/AbstractDiskHttpData.java
View File

@ -300,15 +300,17 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData {
} }
int read = 0; int read = 0;
ByteBuffer byteBuffer = ByteBuffer.allocate(length); ByteBuffer byteBuffer = ByteBuffer.allocate(length);
while (read < length) { try {
int readnow = fileChannel.read(byteBuffer); while (read < length) {
if (readnow == -1) { int readnow = fileChannel.read(byteBuffer);
fileChannel.close(); if (readnow == -1) {
fileChannel = null; break;
break; }
} else {
read += readnow; read += readnow;
} }
} finally {
fileChannel.close();
fileChannel = null;
} }
if (read == 0) { if (read == 0) {
return EMPTY_BUFFER; return EMPTY_BUFFER;