Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-03 19:45:28 -04:00
Code Issues Projects Releases Wiki Activity

#510: Fixes possible hang situation

Browse Source 
(cherry picked from commit 5501c0e7094d094623648dc9355d9b620da7bef8)
This commit is contained in:
Harald Kuhr 2020-01-02 14:55:16 +01:00
parent c087addb76
commit b0e6fbed9f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java
View File

@ -37,7 +37,7 @@ import javax.imageio.stream.ImageInputStream;
import javax.imageio.stream.ImageInputStreamImpl; import javax.imageio.stream.ImageInputStreamImpl;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -58,12 +58,12 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
// TODO: Rewrite JPEGSegment (from metadata) to store stream pos/length, and be able to replay data, and use instead of Segment? // TODO: Rewrite JPEGSegment (from metadata) to store stream pos/length, and be able to replay data, and use instead of Segment?
// TODO: Support multiple JPEG streams (SOI...EOI, SOI...EOI, ...) in a single file // TODO: Support multiple JPEG streams (SOI...EOI, SOI...EOI, ...) in a single file
final private ImageInputStream stream; private final ImageInputStream stream;
final private JPEGSegmentStreamWarningListener warningListener; private final JPEGSegmentStreamWarningListener warningListener;
final private ComponentIdSet componentIds = new ComponentIdSet(); private final ComponentIdSet componentIds = new ComponentIdSet();
private final List<Segment> segments = new ArrayList<Segment>(64); private final List<Segment> segments = new ArrayList<>(64);
private int currentSegment = -1; private int currentSegment = -1;
private Segment segment; private Segment segment;
@ -275,7 +275,7 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
processWarningOccured(String.format("Duplicate component ID %d in SOF", id)); processWarningOccured(String.format("Duplicate component ID %d in SOF", id));
id++; id++;
while (!componentIds.add(id) && componentIds.size() <= 16) { while (componentIds.size() < 4 && !componentIds.add(id) && id < 255) {
id++; id++;
} }
@ -330,7 +330,7 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
} }
static String asAsciiString(final byte[] data, final int offset, final int length) { static String asAsciiString(final byte[] data, final int offset, final int length) {
return new String(data, offset, length, Charset.forName("ascii")); return new String(data, offset, length, StandardCharsets.US_ASCII);
} }
private void streamInit() throws IOException { private void streamInit() throws IOException {
@ -443,8 +443,9 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
} }
@SuppressWarnings({"FinalizeDoesntCallSuperFinalize"}) @SuppressWarnings({"FinalizeDoesntCallSuperFinalize"})
@Deprecated
@Override @Override
protected void finalize() throws Throwable { protected void finalize() {
// Empty finalizer (for improved performance; no need to call super.finalize() in this case) // Empty finalizer (for improved performance; no need to call super.finalize() in this case)
} }
@ -585,7 +586,7 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
} }
static final class ComponentIdSet { static final class ComponentIdSet {
final int[] values = new int[4]; // The native code don't support more than 4 components final int[] values = new int[4]; // The native code doesn't support more than 4 components
int size; int size;
boolean add(final int value) { boolean add(final int value) {