BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Java: Avoid dangerous writes via casted pointers" 

This reverts commit 865de99391.

This fixes bug #688.
This commit is contained in:
Marcus Comstedt 2015-11-01 15:58:00 +01:00 committed by Uwe Hermann
parent ae2cdde4d2
commit 32fd1edc23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bindings/java/org/sigrok/core/classes/classes.i
View File

@ -75,7 +75,7 @@ namespace Glib {
jlong value; jlong value;
for (auto entry : $1) for (auto entry : $1)
{ {
value = reinterpret_cast<intptr_t>(new CValue(entry)); *(CValue **) &value = new CValue(entry);
jenv->CallObjectMethod($result, Vector_add, jenv->CallObjectMethod($result, Vector_add,
jenv->NewObject(Value, Value_init, value, true)); jenv->NewObject(Value, Value_init, value, true));
} }
@ -149,7 +149,8 @@ MAP_COMMON(std::string, std::shared_ptr<sigrok::ClassName>, String, ClassName)
jlong value; jlong value;
for (auto entry : $1) 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->CallObjectMethod($result, HashMap_put,
jenv->NewStringUTF(entry.first.c_str()), jenv->NewStringUTF(entry.first.c_str()),
jenv->NewObject(Value, Value_init, value, true)); jenv->NewObject(Value, Value_init, value, true));
@ -184,8 +185,8 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant)
jlong value; jlong value;
for (auto entry : $1) for (auto entry : $1)
{ {
key = reinterpret_cast<intptr_t>(entry.first); *(const sigrok::ConfigKey **) &key = entry.first;
value = reinterpret_cast<intptr_t>(new Glib::VariantBase(entry.second)); *(Glib::VariantBase **) &value = new Glib::VariantBase(entry.second);
jenv->CallObjectMethod($result, HashMap_put, jenv->CallObjectMethod($result, HashMap_put,
jenv->NewObject(ConfigKey, ConfigKey_init, key, false)); jenv->NewObject(ConfigKey, ConfigKey_init, key, false));
jenv->NewObject(Variant, Variant_init, value, true)); jenv->NewObject(Variant, Variant_init, value, true));
@ -219,7 +220,7 @@ MAP_COMMON(const sigrok::ConfigKey *, std::set<enum sigrok::Capability>,
jlong key; jlong key;
for (auto map_entry : $1) 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); jobject value = jenv->NewObject(HashSet, HashSet_init);
for (auto &set_entry : map_entry.second) for (auto &set_entry : map_entry.second)
jenv->CallObjectMethod(value, HashSet_add, jenv->CallObjectMethod(value, HashSet_add,
@ -267,7 +268,7 @@ typedef jobject jlogcallback;
std::string message) std::string message)
{ {
jlong loglevel_addr; jlong loglevel_addr;
loglevel_addr = reinterpret_cast<intptr_t>(loglevel); *(const sigrok::LogLevel **) &loglevel_addr = loglevel;
jobject loglevel_obj = env->NewObject( jobject loglevel_obj = env->NewObject(
LogLevel, LogLevel_init, loglevel_addr, false); LogLevel, LogLevel_init, loglevel_addr, false);
jobject message_obj = env->NewStringUTF(message.c_str()); jobject message_obj = env->NewStringUTF(message.c_str());
@ -313,8 +314,10 @@ typedef jobject jdatafeedcallback;
{ {
jlong device_addr; jlong device_addr;
jlong packet_addr; jlong packet_addr;
device_addr = reinterpret_cast<intptr_t>(new std::shared_ptr<sigrok::Device>(device)); *(std::shared_ptr<sigrok::Device> **) &device_addr =
packet_addr = reinterpret_cast<intptr_t>(new std::shared_ptr<sigrok::Packet>(packet)); 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( jobject device_obj = env->NewObject(
Device, Device_init, device_addr, true); Device, Device_init, device_addr, true);
jobject packet_obj = env->NewObject( jobject packet_obj = env->NewObject(