Changeset 50393 in vbox for trunk/src/libs/xpcom18a4/java

Timestamp:

Feb 10, 2014 3:04:05 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

92151

Message:

libs/xpcom18a4/java: catastrophic scoping bug (and a much more harmless forgotten deref)

File:

• trunk/src/libs/xpcom18a4/java/src/nsJavaWrapper.cpp (modified) (2 diffs)

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

@@ -1007 +1007 @@
         if (aParamInfo.IsRetval() && !aIsArrayElement) {
           *aParam = env->NewObject(shortClass, shortInitMID, value);
-        } else if ((aParamInfo.IsOut() || aIsArrayElement) && aParam) {
+        } else if ((aParamInfo.IsOut() || aIsArrayElement) && *aParam) {
           env->SetShortArrayRegion((jshortArray) *aParam, aIndex, 1, &value);
         }
@@ -1754 +1754 @@
 
     jobject* javaElement;
+    jobject element = nsnull;
     if (!paramInfo.IsRetval()) {
-      jobject element = env->GetObjectArrayElement(aParams, i);
+      element = env->GetObjectArrayElement(aParams, i);
       javaElement = &element;
     } else {