Changeset 56604 in vbox

Timestamp:

Jun 23, 2015 2:47:32 PM (9 years ago)

Author:

vboxsync

Message:

xpcom/java: fixed two memory leaks

Location:

trunk/src/libs/xpcom18a4/java/src

Files:

• nsJavaInterfaces.cpp (modified) (1 diff)
• nsJavaWrapper.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/java/src/nsJavaInterfaces.cpp

@@ -505 +505 @@
         rv = JavaObjectToNativeInterface(env, aJavaObject, iid, &xpcomObject);
         if (NS_SUCCEEDED(rv)) {
-          rv = ((nsISupports*) xpcomObject)->QueryInterface(iid, &xpcomObject);
+          nsISupports *xpcom_nat_obj = (nsISupports*) xpcomObject;
+          rv = xpcom_nat_obj->QueryInterface(iid, &xpcomObject);
+          NS_IF_RELEASE(xpcom_nat_obj);
         }
       } else {

trunk/src/libs/xpcom18a4/java/src/nsJavaWrapper.cpp

@@ -758 +758 @@
         if (NS_FAILED(rv))
           break;
-        rv = ((nsISupports*) xpcom_obj)->QueryInterface(iid, &xpcom_obj);
+        NS_ENSURE_TRUE(xpcom_obj, NS_ERROR_FAILURE);
+        nsISupports *xpcom_nat_obj = (nsISupports*) xpcom_obj;
+        rv = xpcom_nat_obj->QueryInterface(iid, &xpcom_obj);
+        NS_IF_RELEASE(xpcom_nat_obj);
         if (NS_FAILED(rv))
           break;