cid#1326434, 1326446, 1326248, 1326254

null pointer dereferencing, added null check

Change-Id: I78f3ee1eb5d5bd4ebe7b3a6775db4884859dbcf6
Reviewed-on: https://gerrit.libreoffice.org/21712
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>

3 files changed, 14 insertions, 6 deletions

diff --git a/qadevOOo/runner/util/utils.java b/qadevOOo/runner/util/utils.java
index c3f34589425b..8582f5f24010 100644
--- a/qadevOOo/runner/util/utils.java
+++ b/qadevOOo/runner/util/utils.java
@@ -587,7 +587,8 @@ public class utils {
         } catch (com.sun.star.uno.Exception e) {
         }
 
-        xTrans.parseStrict(rUrl);
+        if (xTrans != null)
+            xTrans.parseStrict(rUrl);
 
         return rUrl[0];
     }
diff --git a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java b/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java
index 971dab8ac3d2..d766c963d7e3 100644
--- a/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java
+++ b/qadevOOo/tests/java/ifc/awt/tree/_XTreeNode.java
@@ -137,12 +137,18 @@ public class _XTreeNode extends MultiMethodTest {
         }
 
         log.println("try to get parrent of children");
-        XTreeNode xParrent = xNode.getParent();
+        if (xNode == null) {
+            log.println("missing xNode");
+            tRes.tested("getParent()", false);
+        }
+        else {
+            XTreeNode xParrent = xNode.getParent();
 
 
-        bOK = oObj.equals(xParrent);
-        log.println("original object and parrent should be the same: " + bOK);
-        tRes.tested("getParent()", bOK);
+            bOK = oObj.equals(xParrent);
+            log.println("original object and parrent should be the same: " + bOK);
+            tRes.tested("getParent()", bOK);
+        }
     }
 
 
diff --git a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java
index 082babb9956b..597e44cee045 100644
--- a/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java
+++ b/qadevOOo/tests/java/ifc/drawing/_DrawingDocumentDrawView.java
@@ -164,7 +164,8 @@ public class _DrawingDocumentDrawView extends MultiPropertyTest {
         }
         log.println("oldZoomValue: "+oldValue);
         log.println("newZoomValue: "+newValue);
-        tRes.tested("ZoomType",(!oldValue.equals(newValue)));
+        if (oldValue != null)
+            tRes.tested("ZoomType",(!oldValue.equals(newValue)));
     }
 
 }