IO: Fix crash when I2C.read() was called without prior write() · pepc84/processing4@41a52e7 · GitHub

pepc84 / processing4 Public

forked from processing/processing4

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 41a52e7

Browse filesBrowse the repository at this point in the historyBrowse files

gohai

committed

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

1 parent 1f2b9a3 commit 41a52e7
Copy full SHA for 41a52e7

1 file changed

+18-14Lines changed: 18 additions & 14 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• java/libraries/io/src/native
  • impl.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎java/libraries/io/src/native/impl.c‎

Copy file name to clipboardExpand all lines: java/libraries/io/src/native/impl.c

+18-14Lines changed: 18 additions & 14 deletions

Original file line number	Diff line number	Diff line change
@@ -304,29 +304,33 @@ JNIEXPORT jint JNICALL Java_processing_io_NativeInterface_transferI2c
304	304	jbyte *out, *in;
305	305
306	306	packets.msgs = msgs;
307		-
308		- msgs[0].addr = slave;
309		- msgs[0].flags = 0;
310		- msgs[0].len = (*env)->GetArrayLength(env, _out);
311		- out = (*env)->GetByteArrayElements(env, _out, NULL);
312		- msgs[0].buf = out;
	307	+ packets.nmsgs = 0;
	308	+
	309	+ if (_out != NULL) {
	310	+ msgs[packets.nmsgs].addr = slave;
	311	+ msgs[packets.nmsgs].flags = 0;
	312	+ msgs[packets.nmsgs].len = (*env)->GetArrayLength(env, _out);
	313	+ out = (*env)->GetByteArrayElements(env, _out, NULL);
	314	+ msgs[packets.nmsgs].buf = out;
	315	+ packets.nmsgs++;
	316	+ }
313	317	if (_in != NULL) {
	318	+ msgs[packets.nmsgs].addr = slave;
	319	+ msgs[packets.nmsgs].flags = I2C_M_RD; // I2C_M_RECV_LEN is not supported
	320	+ msgs[packets.nmsgs].len = (*env)->GetArrayLength(env, _in);
314	321	in = (*env)->GetByteArrayElements(env, _in, NULL);
315		- msgs[1].addr = slave;
316		- msgs[1].flags = I2C_M_RD; // I2C_M_RECV_LEN is not supported
317		- msgs[1].len = (*env)->GetArrayLength(env, _in);
318		- msgs[1].buf = in;
319		- packets.nmsgs = 2;
320		- } else {
321		- packets.nmsgs = 1;
	322	+ msgs[packets.nmsgs].buf = in;
	323	+ packets.nmsgs++;
322	324	}
323	325
324	326	int ret = ioctl(handle, I2C_RDWR, &packets);
325	327	if (ret < 0) {
326	328	ret = -errno;
327	329	}
328	330
329		- (*env)->ReleaseByteArrayElements(env, _out, out, JNI_ABORT);
	331	+ if (_out != NULL) {
	332	+ (*env)->ReleaseByteArrayElements(env, _out, out, JNI_ABORT);
	333	+ }
330	334	if (_in != NULL) {
331	335	(*env)->ReleaseByteArrayElements(env, _in, in, 0);
332	336	}

0 commit comments

Comments

0 (0)