summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-03-04 09:35:51 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-03-04 11:24:27 +0000
commit8a1c6cba0a7cd579274826f1831934f67d957fe4 (patch)
tree073c48727ba33fdeb0faaca26e743a4607954681 /xmerge
parent1ffa92cfe374b1f479166300bc7e27e41ad48acd (diff)
coverity#1326460 Dereference null return value
Change-Id: I18a80d7695f081c6f274dd7de68bd4dee1054be4
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
index aaa690412f45..21831a69173f 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java
@@ -82,8 +82,8 @@ public class ConverterInfoReader {
JarEntry jarentry = jarConnection.getJarEntry();
JarFile jarfile = jarConnection.getJarFile();
- if (jarfile == null) {
- throw new IOException("Missing jar file");
+ if (jarfile == null || jarentry == null) {
+ throw new IOException("Missing jar entry");
}
// Build the InputSource