unmarshaller.h: add NULL check for SafeArrayUnmarshaller

MethodBinder.java: add NULL check for some special cases that cannot get IType from IParam

Author: viruscamp

native/unmarshaller.h

@@ -187,10 +187,12 @@ class SafeArrayUnmarshaller : public Unmarshaller {
 	}
 
 	virtual jarray unmarshal( JNIEnv* env ) {
+		if(psa==NULL) return NULL;
 		return XDUCER::toJava(env,psa);
 	}
 
 	virtual ~SafeArrayUnmarshaller() {
+		if(psa==NULL) return;
 		SafeArrayDestroy(psa);
 	}
 };

tlbimp/src/main/java/com4j/tlbimp/MethodBinder.java

@@ -65,7 +65,12 @@ protected IType getReturnTypeBinding() throws BindingException {
     if (retParam == -1) {
       return null;
     }
-    IPtrType pt = params[retParam].getType().queryInterface(IPtrType.class);
+    IParam p = params[retParam];
+    IType t = p.getType();
+    if (t == null) {
+      throw new BindingException(Messages.UNSUPPORTED_TYPE.format());
+    }
+    IPtrType pt = t.queryInterface(IPtrType.class);
     if (pt == null) {
       throw new BindingException(Messages.RETVAL_MUST_BY_REFERENCE.format());
     }