Merge pull request kohsuke#34 from kllbzz/issue33

fix memory leak from issue kohsuke#33

Author: kohsuke

native/com4j.cpp

@@ -82,7 +82,7 @@ JNIEXPORT jobject JNICALL Java_com4j_Native_invokeDispatch( JNIEnv* env, jclass
 		error(env,__FILE__,__LINE__,hr,"Invocation failed: %s",(LPCSTR)_bstr_t(excepInfo.bstrDescription));
 	}
 
-	delete p;
+	delete[] p;
 
 	return retVal;
 }

native/eventReceiver.cpp

@@ -72,6 +72,7 @@ STDMETHODIMP CEventReceiver::Invoke( DISPID dispid, REFIID riid, LCID lcid, WORD
 		VARIANT* pSrc = convertToVariant(pEnv,r);
 		::VariantCopy(pResult,pSrc);
 		::VariantClear(pSrc);
+		delete pSrc;
 	}
 
 	return S_OK;

native/typelib.cpp

@@ -79,7 +79,7 @@ CMethod::~CMethod() {
 
 	for( int i=0; i<m_nameCount; i++ )
 		SysFreeString(m_pNames[i]);
-	delete m_pNames;
+	delete[] m_pNames;
 }
 
 

native/variant.cpp

@@ -133,7 +133,7 @@ class NoopVariantHandlerImpl : public VariantHandler {
 public:
 	VARIANT* set( JNIEnv* env, jobject src ) {
 		VARIANT* pv = new VARIANT();
-		VariantClear(pv);
+		VariantInit(pv);
 		VariantCopy(pv, com4jVariantToVARIANT(env,src));
 		return pv;
 	}
@@ -148,7 +148,7 @@ class ComEnumHandlerImpl : public VariantHandler {
 public:
 	VARIANT* set( JNIEnv* env, jobject src ) {
 		VARIANT* pv = new VARIANT();
-		VariantClear(pv);
+		VariantInit(pv);
 		pv->vt = VT_I4;
 		pv->intVal = com4j_ComEnum_comEnumValue(env,src);
 		return pv;
@@ -166,7 +166,7 @@ class DateHandlerImpl : public VariantHandler {
 	VARIANT* set( JNIEnv* env, jobject src ) {
 		jdouble d = com4j_Variant_fromDate(env,src);
 		VARIANT* pv = new VARIANT();
-		VariantClear(pv);
+		VariantInit(pv);
 		pv->vt = VT_DATE;
 		pv->date = d;
 		return pv;
@@ -182,7 +182,7 @@ class DecimalHandlerImpl : public VariantHandler {
 public:
 	VARIANT* set( JNIEnv* env, jobject src ) {
 		VARIANT* pv = new VARIANT();
-		VariantClear(pv);
+		VariantInit(pv);
 		pv->vt = VT_DECIMAL;
 
 		jstring s = javaMathBigDecimal_toString(env,src);
@@ -264,7 +264,8 @@ VARIANT* convertToVariant( JNIEnv* env, jobject o ) {
 	// consider a conversion to SAFEARRAY
 	pair<SAFEARRAY*,VARTYPE> sa = safearray::SafeArrayXducer::toNative2(env,static_cast<jarray>(o));
 	if(sa.first!=NULL) {
-		_variant_t* v = new _variant_t();
+		VARIANT* v = new VARIANT();
+		VariantInit(v);
 		v->vt = VT_ARRAY|sa.second;
 		v->parray = sa.first;
 		return v;

native/xducer2.h

@@ -14,7 +14,8 @@ namespace xducer {
 		typedef jobject JavaType;
 
 		static inline NativeType toNative( JNIEnv* env, JavaType value ) {
-			return *convertToVariant(env,value);
+			std::auto_ptr<VARIANT> v(convertToVariant(env,value)); // need to be deleted after copy as return value
+			return *v;
 		}
 
 		static inline JavaType toJava( JNIEnv* env, NativeType value ) {