From b08e200c3dfa964f257c8b7719ef9c801fb107d7 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 4 Mar 2016 10:08:35 +0000
Subject: coverity#1326237 Dereference after null check

Change-Id: Iac84adff096c5b847b2a63ac57ddf5b2f5e34e11
---
 .../xmerge/converter/xml/sxc/SxcDocumentDeserializer.java          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'xmerge')

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java
index bfd7fb3e8476..1523b9089585 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentDeserializer.java
@@ -490,11 +490,16 @@ public abstract class SxcDocumentDeserializer implements OfficeConstants,
                 Debug.log(Debug.TRACE, "<tr>");
             }
 
+            if (rowElement == null) {
+                //utterly busted
+                break;
+            }
+
             // Get the column number of the current cell
             int newCol = decoder.getColNumber();
 
             // Check to see if some columns were skipped
-            if (newCol != col && rowElement != null) {
+            if (newCol != col) {
 
                 // How many columns have we skipped?
                 int numColsSkipped = newCol - col;
-- 
cgit