infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-09 14:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

8023565: JPG causes javax.imageio.IIOException: ICC APP2 encoutered without prior JFIF

Browse Source 
Reviewed-by: bae, vadim
This commit is contained in:
Mikhail Cherkasov 2013-09-04 18:12:49 +04:00
parent 1530a30f52
commit b33bcb9185
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2013, 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
@ -278,10 +278,11 @@ public class JPEGMetadata extends IIOMetadata implements Cloneable {
(JFIFMarkerSegment) findMarkerSegment
(JFIFMarkerSegment.class, true);
if (jfif == null) {
throw new IIOException
("ICC APP2 encountered without prior JFIF!");
newGuy = new MarkerSegment(buffer);
newGuy.loadData(buffer);
} else {
jfif.addICC(buffer);
}
jfif.addICC(buffer);
// newGuy remains null
} else {
newGuy = new MarkerSegment(buffer);