eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-05-03 01:15:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

IO: Fix crash when I2C.read() was called without prior write()

Browse Source
This commit is contained in:
gohai
2018-06-28 14:31:14 -07:00
committed by Gottfried Haider
parent 1f2b9a3e47
commit 41a52e7423
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
java/libraries/io/src/native/impl.c
View File

@@ -304,21 +304,23 @@ JNIEXPORT jint JNICALL Java_processing_io_NativeInterface_transferI2c
jbyte *out, *in;
packets.msgs = msgs;
packets.nmsgs = 0;
msgs[0].addr = slave;
msgs[0].flags = 0;
msgs[0].len = (*env)->GetArrayLength(env, _out);
out = (*env)->GetByteArrayElements(env, _out, NULL);
msgs[0].buf = out;
if (_out != NULL) {
msgs[packets.nmsgs].addr = slave;
msgs[packets.nmsgs].flags = 0;
msgs[packets.nmsgs].len = (*env)->GetArrayLength(env, _out);
out = (*env)->GetByteArrayElements(env, _out, NULL);
msgs[packets.nmsgs].buf = out;
packets.nmsgs++;
}
if (_in != NULL) {
msgs[packets.nmsgs].addr = slave;
msgs[packets.nmsgs].flags = I2C_M_RD; // I2C_M_RECV_LEN is not supported
msgs[packets.nmsgs].len = (*env)->GetArrayLength(env, _in);
in = (*env)->GetByteArrayElements(env, _in, NULL);
msgs[1].addr = slave;
msgs[1].flags = I2C_M_RD; // I2C_M_RECV_LEN is not supported
msgs[1].len = (*env)->GetArrayLength(env, _in);
msgs[1].buf = in;
packets.nmsgs = 2;
} else {
packets.nmsgs = 1;
msgs[packets.nmsgs].buf = in;
packets.nmsgs++;
}
int ret = ioctl(handle, I2C_RDWR, &packets);
@@ -326,7 +328,9 @@ JNIEXPORT jint JNICALL Java_processing_io_NativeInterface_transferI2c
ret = -errno;
}
(*env)->ReleaseByteArrayElements(env, _out, out, JNI_ABORT);
if (_out != NULL) {
(*env)->ReleaseByteArrayElements(env, _out, out, JNI_ABORT);
}
if (_in != NULL) {
(*env)->ReleaseByteArrayElements(env, _in, in, 0);
}