Java: Fill jlongs with 0 when doing SWIG style pointer marshalling

[libsigrok.git] / bindings / java / org / sigrok / core / classes / classes.i

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index 7a61bfd55d2610b7bfa5b0da333b7868fbfaaeaa..894c72f75b9d501daa582b75e744451588018df8 100644 (file)
--- a/bindings/java/org/sigrok/core/classes/classes.i
+++ b/bindings/java/org/sigrok/core/classes/classes.i
@@ -72,10 +72,10 @@ namespace Glib {
   jclass Value = jenv->FindClass("org/sigrok/core/classes/" #JValue);
   jmethodID Value_init = jenv->GetMethodID(Value, "<init>", "(JZ)V");
   $result = jenv->NewObject(Vector, Vector_init);
-  jlong value;
+  jlong value = 0;
   for (auto entry : $1)
   {
-    value = reinterpret_cast<intptr_t>(new CValue(entry));
+    *(CValue **) &value = new CValue(entry);
     jenv->CallObjectMethod($result, Vector_add,
       jenv->NewObject(Value, Value_init, value, true));
   }
@@ -146,10 +146,11 @@ MAP_COMMON(std::string, std::shared_ptr<sigrok::ClassName>, String, ClassName)
   jclass Value = jenv->FindClass("org/sigrok/core/classes/" #ClassName);
   jmethodID Value_init = jenv->GetMethodID(Value, "<init>", "(JZ)V");
   $result = jenv->NewObject(HashMap, HashMap_init);
-  jlong value;
+  jlong value = 0;
   for (auto entry : $1)
   {
-    value = reinterpret_cast<intptr_t>(new std::shared_ptr< sigrok::ClassName>(entry.second));
+    *(std::shared_ptr< sigrok::ClassName > **)&value =
+      new std::shared_ptr< sigrok::ClassName>(entry.second);
     jenv->CallObjectMethod($result, HashMap_put,
       jenv->NewStringUTF(entry.first.c_str()),
       jenv->NewObject(Value, Value_init, value, true));
@@ -180,12 +181,12 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant)
   jclass Variant = jenv->FindClass("org/sigrok/core/classes/Variant");
   jmethodID Variant_init = jenv->GetMethodID(Variant, "<init>", "(JZ)V");
   $result = jenv->NewObject(HashMap, HashMap_init);
-  jlong key;
-  jlong value;
+  jlong key = 0;
+  jlong value = 0;
   for (auto entry : $1)
   {
-    key = reinterpret_cast<intptr_t>(entry.first);
-    value = reinterpret_cast<intptr_t>(new Glib::VariantBase(entry.second));
+    *(const sigrok::ConfigKey **) &key = entry.first;
+    *(Glib::VariantBase **) &value = new Glib::VariantBase(entry.second);
     jenv->CallObjectMethod($result, HashMap_put,
       jenv->NewObject(ConfigKey, ConfigKey_init, key, false));
       jenv->NewObject(Variant, Variant_init, value, true));
@@ -216,10 +217,10 @@ MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
   jmethodID Capability_swigToEnum = jenv->GetStaticMethodID(Capability,
     "swigToEnum", "(I)Lorg/sigrok/core/classes/Capability;");
   $result = jenv->NewObject(HashMap, HashMap_init);
-  jlong key;
+  jlong key = 0;
   for (auto map_entry : $1)
   {
-    key = reinterpret_cast<intptr_t>(map_entry.first);
+    *(const sigrok::ConfigKey **) &key = map_entry.first;
     jobject value = jenv->NewObject(HashSet, HashSet_init);
     for (auto &set_entry : map_entry.second)
       jenv->CallObjectMethod(value, HashSet_add,
@@ -266,8 +267,8 @@ typedef jobject jlogcallback;
       const sigrok::LogLevel *loglevel,
       std::string message)
     {
-      jlong loglevel_addr;
-      loglevel_addr = reinterpret_cast<intptr_t>(loglevel);
+      jlong loglevel_addr = 0;
+      *(const sigrok::LogLevel **) &loglevel_addr = loglevel;
       jobject loglevel_obj = env->NewObject(
         LogLevel, LogLevel_init, loglevel_addr, false);
       jobject message_obj = env->NewStringUTF(message.c_str());
@@ -311,10 +312,12 @@ typedef jobject jdatafeedcallback;
       std::shared_ptr<sigrok::Device> device,
       std::shared_ptr<sigrok::Packet> packet)
     {
-      jlong device_addr;
-      jlong packet_addr;
-      device_addr = reinterpret_cast<intptr_t>(new std::shared_ptr<sigrok::Device>(device));
-      packet_addr = reinterpret_cast<intptr_t>(new std::shared_ptr<sigrok::Packet>(packet));
+      jlong device_addr = 0;
+      jlong packet_addr = 0;
+      *(std::shared_ptr<sigrok::Device> **) &device_addr =
+        new std::shared_ptr<sigrok::Device>(device);
+      *(std::shared_ptr<sigrok::Packet> **) &packet_addr =
+        new std::shared_ptr<sigrok::Packet>(packet);
       jobject device_obj = env->NewObject(
         Device, Device_init, device_addr, true);
       jobject packet_obj = env->NewObject(