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

[jan iversen]

 qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java                      |    2 ++
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java |    6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 4b368564091a0023e1981bd8346716db2474b068
Author: jan iversen <jani at documentfoundation.org>
Date:   Sat Jan 23 18:38:24 2016 +0100

    cid#1326176, 1326270, 1326271, 1326272, 1326273, 1326274, 1326275
    
    null pointer used to dereference, add "if"
    
    Change-Id: I37173f252a3b3da44976581ccefd0ed54aa8aa0d
    Reviewed-on: https://gerrit.libreoffice.org/21735
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
index 322138d..faa0274 100644
--- a/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
+++ b/qadevOOo/tests/java/ifc/frame/_XSynchronousFrameLoader.java
@@ -110,6 +110,8 @@ public class _XSynchronousFrameLoader extends MultiMethodTest {
         URL[] urlS = new URL[1];
         urlS[0] = new URL();
         urlS[0].Complete = url;
+        if (xURLTrans == null)
+          throw new IllegalStateException("xURLTrans unexpected null");
         boolean res = xURLTrans.parseStrict(urlS);
         log.println("Parsing URL '" + url + "': " + res);
         descr = new PropertyValue[1] ;
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
index b549743..de377ec 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfo.java
@@ -153,6 +153,10 @@ public class ConverterInfo {
         String version, String vendor, String impl)
         throws RegistryException {
 
+        if (officeMime == null || displayName == null || description == null ||
+            version    == null || vendor      == null || impl        == null)
+          throw new IllegalArgumentException("arguments unexpected null");
+
         if (!isValidOfficeType(officeMime.trim())) {
             RegistryException re = new RegistryException(
                 "Invalid office type");
@@ -387,4 +391,4 @@ public class ConverterInfo {
     public String getXsltDeserial() {
         return piXsltDeserial;
     }
-}
\ No newline at end of file
+}