Kaydet (Commit) 4b368564 authored tarafından jan iversen's avatar jan iversen

cid#1326176, 1326270, 1326271, 1326272, 1326273, 1326274, 1326275

null pointer used to dereference, add "if"

Change-Id: I37173f252a3b3da44976581ccefd0ed54aa8aa0d
Reviewed-on: https://gerrit.libreoffice.org/21735Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarjan iversen <jani@documentfoundation.org>
üst 3c28a0e3
......@@ -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] ;
......
......@@ -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
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment