Bug 132 32 bit pointers not coerced to 64 bit correctly

freemansoft · Jun 10, 2018 · 7edda76 · 7edda76
1 parent 93cdadf
commit 7edda76
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/jacob/jni/Dispatch.cpp b/jacob/jni/Dispatch.cpp
@@ -81,7 +81,8 @@ JNIEXPORT jobject JNICALL Java_com_jacob_com_Dispatch_QueryInterface
   // I am copying the pointer to java
   // jacob-msg 1817 - SF 1053871 :  QueryInterface already called AddRef!!
   //if (disp) disp->AddRef();
-  jobject newAuto = env->NewObject(autoClass, autoCons, disp);
+  // jacobproject/bug/132
+  jobject newAuto = env->NewObject(autoClass, autoCons, (jlong)(uintptr_t)disp);
   return newAuto;
 }
 

diff --git a/jacob/jni/DispatchProxy.cpp b/jacob/jni/DispatchProxy.cpp
@@ -87,7 +87,8 @@ JNIEXPORT jobject JNICALL Java_com_jacob_com_DispatchProxy_MarshalFromStream
   // construct a Dispatch object to return
   // I am copying the pointer to java
   if (pD) pD->AddRef();
-  jobject newAuto = env->NewObject(autoClass, autoCons, pD);
+  // jacobproject/bug/132
+  jobject newAuto = env->NewObject(autoClass, autoCons, (jlong)(uintptr_t)pD);
   return newAuto;
 }
 

diff --git a/jacob/jni/Variant.cpp b/jacob/jni/Variant.cpp
@@ -190,7 +190,8 @@ JNIEXPORT jobject JNICALL Java_com_jacob_com_Variant_toEnumVariant
     // SF-1674179 fix EnumVariants memory leak
     // AJ: yes, but the QueryInterface call above already incremented the reference
     //if (ie) ie->AddRef();
-    jobject newAuto = env->NewObject(autoClass, autoCons, ie);
+    // jacobproject/bug/132
+    jobject newAuto = env->NewObject(autoClass, autoCons, (jlong)(uintptr_t)ie);
     return newAuto;
   }
   return NULL;
@@ -411,7 +412,8 @@ JNIEXPORT jobject JNICALL Java_com_jacob_com_Variant_toVariantDispatch
     IDispatch *disp = V_DISPATCH(v);
     // I am copying the pointer to java
     if (disp) disp->AddRef();
-    jobject newAuto = env->NewObject(autoClass, autoCons, disp);
+    // jacobproject/bug/132
+    jobject newAuto = env->NewObject(autoClass, autoCons, (jlong)(uintptr_t)disp);
     return newAuto;
   }
   return NULL;