boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

protection against OOM cases in image parser. See also bugs.yacy.net/view.php?id=54

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7942 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 13 years ago
parent 52a2b3f110
commit 0819e1d397
1 changed files with 66 additions and 60 deletions
Show Stats Download Patch File Download Diff File

70
source/net/yacy/document/parser/images/genericImageParser.java
Unescape View File

@ -33,24 +33,16 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;import java.net.MalformedURLException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Properties;
import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
import javax.imageio.ImageIO;
import com.drew.imaging.jpeg.JpegProcessingException;
import com.drew.imaging.jpeg.JpegSegmentReader;
import com.drew.metadata.Directory;
import com.drew.metadata.Metadata;
import com.drew.metadata.MetadataException;
import com.drew.metadata.Tag;
import com.drew.metadata.exif.ExifReader;
import com.drew.metadata.iptc.IptcReader;
import net.yacy.cora.document.MultiProtocolURI;
import net.yacy.cora.document.UTF8;
import net.yacy.document.AbstractParser;
@ -61,6 +53,15 @@ import net.yacy.document.parser.images.bmpParser.IMAGEMAP;
import net.yacy.kelondro.logging.Log;
import net.yacy.kelondro.util.FileUtils;
import com.drew.imaging.jpeg.JpegProcessingException;
import com.drew.imaging.jpeg.JpegSegmentReader;
import com.drew.metadata.Directory;
import com.drew.metadata.Metadata;
import com.drew.metadata.MetadataException;
import com.drew.metadata.Tag;
import com.drew.metadata.exif.ExifReader;
import com.drew.metadata.iptc.IptcReader;
public class genericImageParser extends AbstractParser implements Parser {
/**
@ -103,11 +104,11 @@ public class genericImageParser extends AbstractParser implements Parser {
byte[] b;
try {
b = FileUtils.read(sourceStream);
} catch (IOException e) {
} catch (final IOException e) {
Log.logException(e);
throw new Parser.Failure(e.getMessage(), location);
}
IMAGEMAP imap = bmpParser.parse(b);
final IMAGEMAP imap = bmpParser.parse(b);
ii = parseJavaImage(location, imap.getImage());
} else if (mimeType.equals("image/jpg") ||
location.getFileExtension().equals("jpg") ||
@ -120,7 +121,7 @@ public class genericImageParser extends AbstractParser implements Parser {
byte[] b;
try {
b = FileUtils.read(sourceStream);
} catch (IOException e) {
} catch (final IOException e) {
Log.logException(e);
throw new Parser.Failure(e.getMessage(), location);
}
@ -131,25 +132,27 @@ public class genericImageParser extends AbstractParser implements Parser {
try {
segmentReader = new JpegSegmentReader(new ByteArrayInputStream(b));
byte[] exifSegment = segmentReader.readSegment(JpegSegmentReader.SEGMENT_APP1);
byte[] iptcSegment = segmentReader.readSegment(JpegSegmentReader.SEGMENT_APPD);
Metadata metadata = new Metadata();
final byte[] exifSegment = segmentReader.readSegment(JpegSegmentReader.SEGMENT_APP1);
final byte[] iptcSegment = segmentReader.readSegment(JpegSegmentReader.SEGMENT_APPD);
final Metadata metadata = new Metadata();
new ExifReader(exifSegment).extract(metadata);
new IptcReader(iptcSegment).extract(metadata);
@SuppressWarnings("unchecked")
final
Iterator<Directory> directories = metadata.getDirectoryIterator();
HashMap<String, String> props = new HashMap<String, String>();
final HashMap<String, String> props = new HashMap<String, String>();
while (directories.hasNext()) {
Directory directory = directories.next();
final Directory directory = directories.next();
@SuppressWarnings("unchecked")
final
Iterator<Tag> tags = directory.getTagIterator();
while (tags.hasNext()) {
Tag tag = tags.next();
final Tag tag = tags.next();
try {
props.put(tag.getTagName(), tag.getDescription());
ii.info.append(tag.getTagName() + ": " + tag.getDescription() + " .\n");
} catch (MetadataException e) {
} catch (final MetadataException e) {
//Log.logException(e);
}
}
@ -172,7 +175,7 @@ public class genericImageParser extends AbstractParser implements Parser {
if (description == null || description.length() == 0) description = props.get("Province/State");
if (description == null || description.length() == 0) description = props.get("Copyright Notice");
}
} catch (JpegProcessingException e) {
} catch (final JpegProcessingException e) {
//Log.logException(e);
// just ignore
}
@ -184,7 +187,7 @@ public class genericImageParser extends AbstractParser implements Parser {
final HashMap<MultiProtocolURI, Properties> anchors = new HashMap<MultiProtocolURI, Properties>();
final HashMap<MultiProtocolURI, ImageEntry> images = new HashMap<MultiProtocolURI, ImageEntry>();
// add this image to the map of images
String infoString = ii.info.toString();
final String infoString = ii.info.toString();
images.put(ii.location, new ImageEntry(location, "", ii.width, ii.height, -1));
if (title == null || title.length() == 0) title = MultiProtocolURI.unescape(location.getFileName());
@ -230,6 +233,9 @@ public class genericImageParser extends AbstractParser implements Parser {
} catch (final IOException e) {
Log.logException(e);
throw new Parser.Failure(e.getMessage(), location);
} catch (final Throwable e) { // may appear in case of an OutOfMemoryError
Log.logException(e);
throw new Parser.Failure(e.getMessage(), location);
}
if (image == null) throw new Parser.Failure("ImageIO returned NULL", location);
return parseJavaImage(location, image);
@ -238,7 +244,7 @@ public class genericImageParser extends AbstractParser implements Parser {
public static ImageInfo parseJavaImage(
final MultiProtocolURI location,
final BufferedImage image) {
ImageInfo ii = new ImageInfo(location);
final ImageInfo ii = new ImageInfo(location);
ii.image = image;
// scan the image
@ -262,7 +268,7 @@ public class genericImageParser extends AbstractParser implements Parser {
String [] propNames = ii.image.getPropertyNames();
if (propNames == null) propNames = new String[0];
ii.info.append("\n");
for (String propName: propNames) {
for (final String propName: propNames) {
ii.info.append(propName).append(" = ").append(ii.image.getProperty(propName)).append(" .\n");
}
// append also properties that we measured
@ -290,20 +296,20 @@ public class genericImageParser extends AbstractParser implements Parser {
public static void main(final String[] args) {
File image = new File(args[0]);
genericImageParser parser = new genericImageParser();
final File image = new File(args[0]);
final genericImageParser parser = new genericImageParser();
MultiProtocolURI uri;
try {
uri = new MultiProtocolURI("http://localhost/" + image.getName());
Document[] document = parser.parse(uri, "image/" + uri.getFileExtension(), "UTF-8", new FileInputStream(image));
final Document[] document = parser.parse(uri, "image/" + uri.getFileExtension(), "UTF-8", new FileInputStream(image));
System.out.println(document[0].toString());
} catch (MalformedURLException e) {
} catch (final MalformedURLException e) {
e.printStackTrace();
} catch (FileNotFoundException e) {
} catch (final FileNotFoundException e) {
e.printStackTrace();
} catch (Parser.Failure e) {
} catch (final Parser.Failure e) {
e.printStackTrace();
} catch (InterruptedException e) {
} catch (final InterruptedException e) {
e.printStackTrace();
}
}

Write Preview
Loading…
Cancel
Save