archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-25 22:04:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8349909: jdk.internal.jimage.decompressor.ZipDecompressor does not close the Inflater in exceptional cases

Browse source 
Reviewed-by: lancea, alanb
This commit is contained in:
Jaikiran Pai 2025-02-17 11:05:59 +00:00
parent f1258f9e16
commit 071c8f5155
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/java.base/share/classes/jdk/internal/jimage/decompressor/ZipDecompressor.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -50,15 +50,17 @@ final class ZipDecompressor implements ResourceDecompressor {
}
byte[] bytesOut = new byte[(int) originalSize];
Inflater inflater = new Inflater();
inflater.setInput(bytesIn, offset, bytesIn.length - offset);
int count = 0;
while (!inflater.finished() && count < originalSize) {
count += inflater.inflate(bytesOut, count, bytesOut.length - count);
}
Inflater inflater = new Inflater();
try {
inflater.setInput(bytesIn, offset, bytesIn.length - offset);
inflater.end();
while (!inflater.finished() && count < originalSize) {
count += inflater.inflate(bytesOut, count, bytesOut.length - count);
}
} finally {
inflater.end();
}
if (count != originalSize) {
throw new IOException("Resource content size mismatch");