[Libreoffice-commits] core.git: 2 commits - xmerge/source

[Caolán McNamara]

 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java |    4 ++--
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java                         |    8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit ac00222a258c837bf60669db2bd03ee06cdf86a0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 28 20:57:44 2015 +0000

    coverity#1326258 Explicit null dereferenced
    
    Change-Id: I58b07353f4dca7fc24305bd0120ed7db18339e83

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
index cb7167b..67432ac 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
@@ -140,7 +140,7 @@ public final class PluginFactoryImpl extends PluginFactory
         try {
             props.load(is);
 
-            String info = props.getProperty(mimeType);
+            String info = mimeType != null ? props.getProperty(mimeType) : null;
             if (info != null) {
                 ext = info;
             }
@@ -171,4 +171,4 @@ public final class PluginFactoryImpl extends PluginFactory
         DocumentMergerImpl merger = new DocumentMergerImpl(doc, cc);
         return merger;
     }
-}
\ No newline at end of file
+}
commit 4a0a89f2ee602394f3b67437eb047ace33f2ada6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 28 20:54:42 2015 +0000

    coverity#1326465 Dereference null return value
    
    Change-Id: I0bb704e3f49444c7b377ac22acb52cf2dd58325f

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java
index 71e68f3..9cf24bf 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/XmlUtil.java
@@ -45,8 +45,10 @@ public final class XmlUtil {
         // clone the starting node
         Node clonedNode = cloneNode(docNode, newNode);
 
-        // then clone the sub-tree recursively
-        cloneTree(docNode, clonedNode, newNode);
+        if (clonedNode != null) {
+            // then clone the sub-tree recursively
+            cloneTree(docNode, clonedNode, newNode);
+        }
 
         return clonedNode;
     }
@@ -166,4 +168,4 @@ public final class XmlUtil {
 
         return buffer.toString();
     }
-}
\ No newline at end of file
+}