From 8a1c6cba0a7cd579274826f1831934f67d957fe4 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 4 Mar 2016 09:35:51 +0000
Subject: coverity#1326460 Dereference null return value

Change-Id: I18a80d7695f081c6f274dd7de68bd4dee1054be4
---
 .../java/org/openoffice/xmerge/util/registry/ConverterInfoReader.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'xmerge')

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
-- 
cgit