Revert "Java: Avoid dangerous writes via casted pointers"

This reverts commit 865de99391194e45a0e80ea534fc5e27d5287925.

This fixes bug #688.

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index 7a61bfd55d2610b7bfa5b0da333b7868fbfaaeaa..5a020d7ec3b960837f676392485a5b91bdeb34c1 100644 (file)
--- a/bindings/java/org/sigrok/core/classes/classes.i
+++ b/bindings/java/org/sigrok/core/classes/classes.i
@@ -75,7 +75,7 @@ namespace Glib {
   jlong value;
   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));
   }
@@ -149,7 +149,8 @@ MAP_COMMON(std::string, std::shared_ptr<sigrok::ClassName>, String, ClassName)
   jlong value;
   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));
@@ -184,8 +185,8 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant)
   jlong value;
   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));
@@ -219,7 +220,7 @@ MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
   jlong key;
   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,
@@ -267,7 +268,7 @@ typedef jobject jlogcallback;
       std::string message)
     {
       jlong loglevel_addr;
-      loglevel_addr = reinterpret_cast<intptr_t>(loglevel);
+      *(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());
@@ -313,8 +314,10 @@ typedef jobject jdatafeedcallback;
     {
       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));
+      *(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(