summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-02-18 16:28:29 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-02-18 17:21:18 +0000
commitdd922f104a80394ac4bb52622e47e1342dd9bacb (patch)
tree49d323aef4562a1886195a2424fbbef4f80c9e66 /xmerge
parent089dae6676ef34378c3093a71db6e1dca6cffd80 (diff)
coverity#1326443 Dereference null return value
Change-Id: Ic5f9290c5f8d9ce46b6f5bb7120b9da85d395d40
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
index 0fd2320271dc..019beaf97ed4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
@@ -410,7 +410,7 @@ public final class ConverterInfoMgr {
} else {
ConverterInfo[] foundInfo = ConverterInfoMgr.findConverterInfoChain(findMimeOne,
findMimeTwo);
- if (foundInfo[0] != null && foundInfo[1] != null ) {
+ if (foundInfo != null && foundInfo[0] != null && foundInfo[1] != null ) {
System.out.println(" Found ConverterInfo Chain");
System.out.println(" DisplayName : " + foundInfo[0].getDisplayName());
System.out.println(" DisplayName : " + foundInfo[1].getDisplayName());