From 795e22baa7a0d08e88c870f563a99a60cd2fd75b Mon Sep 17 00:00:00 2001 From: Melissa Linkert Date: Tue, 26 Jan 2016 10:22:56 -0600 Subject: [PATCH] OME-TIFF: make sure BinaryOnly files reference a valid MetadataFile See https://trello.com/c/mVFYhwcJ/87-qa16988 --- .../formats-bsd/src/loci/formats/in/OMETiffReader.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/formats-bsd/src/loci/formats/in/OMETiffReader.java b/components/formats-bsd/src/loci/formats/in/OMETiffReader.java index 543f3d23b4a..6707cc680d4 100644 --- a/components/formats-bsd/src/loci/formats/in/OMETiffReader.java +++ b/components/formats-bsd/src/loci/formats/in/OMETiffReader.java @@ -216,7 +216,11 @@ else if (description instanceof String) { try { String metadataFile = meta.getBinaryOnlyMetadataFile(); - if (metadataFile != null) { + // check the suffix to make sure that the MetadataFile is not + // referencing the current OME-TIFF + if (metadataFile != null && !checkSuffix(metadataFile, "ome.tiff") && + !checkSuffix(metadataFile, "ome.tif")) + { return true; } }