rik/jlibusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memory leak in JNI write functions fixed

Browse Source 
git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@270 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
spandi
2008-12-20 08:44:46 +00:00
parent 7c6ebbe8fa
commit fae4615b79
5 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
LibusbJava/.cproject
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?> <?fileVersion 4.0.0?>
<cproject> <cproject>
@@ -47,11 +47,7 @@
</scannerInfoProvider> </scannerInfoProvider>
</profile> </profile>
</storageModule> </storageModule>
<storageModule moduleId="org.eclipse.cdt.core.pathentry">
<pathentry kind="src" path=""/>
<pathentry kind="out" path=""/>
<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
</storageModule>
<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.1096271423" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig"> <storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.1096271423" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig">
<externalSettings/> <externalSettings/>
<extensions> <extensions>
@@ -59,6 +55,13 @@
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
</extensions> </extensions>
</storageModule> </storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="org.eclipse.cdt.core.pathentry">
<pathentry kind="src" path=""/>
<pathentry kind="out" path=""/>
<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
</storageModule>
</cconfiguration> </cconfiguration>
</storageModule> </storageModule>
</cproject> </cproject>

69
LibusbJava/LibusbJava.cpp
View File

@@ -1,4 +1,4 @@
/* /*
* Java libusb wrapper * Java libusb wrapper
* Copyright (c) 2005-2006 Andreas Schl<68>pfer <spandi at users.sourceforge.net> * Copyright (c) 2005-2006 Andreas Schl<68>pfer <spandi at users.sourceforge.net>
* *
@@ -135,9 +135,9 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1find_1devices
JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1busses JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1busses
(JNIEnv *env, jclass obj) (JNIEnv *env, jclass obj)
{ {
clearLibusbJavaError(); clearLibusbJavaError();
// only load class, method and field ID references once // only load class, method and field ID references once
if (!java_references_loaded) { if (!java_references_loaded) {
// find classes and field ids // find classes and field ids
@@ -159,7 +159,7 @@ JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1busses
if (usb_devClazz == NULL) { return NULL; /* exception thrown */ } if (usb_devClazz == NULL) { return NULL; /* exception thrown */ }
usb_devMid = env->GetMethodID(usb_devClazz, "<init>","()V"); usb_devMid = env->GetMethodID(usb_devClazz, "<init>","()V");
if (usb_devMid == NULL) { return NULL; } if (usb_devMid == NULL) { return NULL; }
usb_devFID_next = env->GetFieldID(usb_devClazz, "next", "Lch/ntb/usb/Usb_Device;"); usb_devFID_next = env->GetFieldID(usb_devClazz, "next", "Lch/ntb/usb/Usb_Device;");
usb_devFID_prev = env->GetFieldID(usb_devClazz, "prev", "Lch/ntb/usb/Usb_Device;"); usb_devFID_prev = env->GetFieldID(usb_devClazz, "prev", "Lch/ntb/usb/Usb_Device;");
usb_devFID_filename = env->GetFieldID(usb_devClazz, "filename", "Ljava/lang/String;"); usb_devFID_filename = env->GetFieldID(usb_devClazz, "filename", "Ljava/lang/String;");
@@ -268,7 +268,7 @@ JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1busses
busses = usb_get_busses(); busses = usb_get_busses();
bus = busses; bus = busses;
if (!bus){ if (!bus){
return NULL; return NULL;
} }
// objects // objects
@@ -276,9 +276,9 @@ JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1busses
main_usb_devObj, usb_devObj, usb_devObj_next, usb_devObj_prev, \ main_usb_devObj, usb_devObj, usb_devObj_next, usb_devObj_prev, \
usb_devDescObj, usb_confDescObj, usb_intObj, usb_intDescObj, \ usb_devDescObj, usb_confDescObj, usb_intObj, usb_intDescObj, \
usb_epDescObj; usb_epDescObj;
jobjectArray usb_confDescObjArray, usb_intObjArray, usb_intDescObjArray, usb_epDescObjArray; jobjectArray usb_confDescObjArray, usb_intObjArray, usb_intDescObjArray, usb_epDescObjArray;
usb_busObj = NULL; usb_busObj = NULL;
usb_busObj_prev = NULL; usb_busObj_prev = NULL;
main_usb_busObj = NULL; main_usb_busObj = NULL;
@@ -301,7 +301,7 @@ JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1busses
} }
main_usb_busObj = usb_busObj; main_usb_busObj = usb_busObj;
} }
// fill the fields of the object // fill the fields of the object
usb_busObj_next = NULL; usb_busObj_next = NULL;
if (bus->next){ if (bus->next){
@@ -315,12 +315,12 @@ JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1busses
env->SetObjectField(usb_busObj, usb_busFID_prev, usb_busObj_prev); env->SetObjectField(usb_busObj, usb_busFID_prev, usb_busObj_prev);
env->SetObjectField(usb_busObj, usb_busFID_dirname, env->NewStringUTF(bus->dirname)); env->SetObjectField(usb_busObj, usb_busFID_dirname, env->NewStringUTF(bus->dirname));
env->SetLongField(usb_busObj, usb_busFID_location, bus->location); env->SetLongField(usb_busObj, usb_busFID_location, bus->location);
dev = bus->devices; dev = bus->devices;
usb_devObj = NULL; usb_devObj = NULL;
usb_devObj_prev = NULL; usb_devObj_prev = NULL;
main_usb_devObj = NULL; main_usb_devObj = NULL;
while (dev){ while (dev){
#ifdef DEBUGON #ifdef DEBUGON
printf("\tusb_get_busses: dev %x (4)\n", dev); printf("\tusb_get_busses: dev %x (4)\n", dev);
@@ -516,9 +516,9 @@ JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1busses
} }
env->SetObjectField(usb_intObj, usb_intFID_altsetting, usb_intDescObjArray); env->SetObjectField(usb_intObj, usb_intFID_altsetting, usb_intDescObjArray);
} }
env->SetObjectField(usb_confDescObj, usb_confDescFID_interface_, usb_intObjArray); env->SetObjectField(usb_confDescObj, usb_confDescFID_interface_, usb_intObjArray);
} }
env->SetObjectField(usb_devObj, usb_devFID_config, usb_confDescObjArray); env->SetObjectField(usb_devObj, usb_devFID_config, usb_confDescObjArray);
@@ -528,14 +528,14 @@ JNIEXPORT jobject JNICALL Java_ch_ntb_usb_LibusbJava_usb_1get_1busses
} }
env->SetObjectField(usb_busObj, usb_busFID_devices, main_usb_devObj); env->SetObjectField(usb_busObj, usb_busFID_devices, main_usb_devObj);
env->SetObjectField(usb_busObj, usb_busFID_root_dev, main_usb_devObj); env->SetObjectField(usb_busObj, usb_busFID_root_dev, main_usb_devObj);
usb_busObj_prev = usb_busObj; usb_busObj_prev = usb_busObj;
usb_busObj = usb_busObj_next; usb_busObj = usb_busObj_next;
bus = bus->next; bus = bus->next;
} }
#ifdef DEBUGON #ifdef DEBUGON
printf("usb_get_busses: done\n"); printf("usb_get_busses: done\n");
#endif #endif
return main_usb_busObj; return main_usb_busObj;
} }
@@ -553,12 +553,12 @@ JNIEXPORT jlong JNICALL Java_ch_ntb_usb_LibusbJava_usb_1open
setLibusbJavaError("shared library error: busses is null"); setLibusbJavaError("shared library error: busses is null");
return 0; return 0;
} }
unsigned char devnum = env->GetByteField(dev, usb_devFID_devnum); unsigned char devnum = env->GetByteField(dev, usb_devFID_devnum);
struct usb_device *usb_device_cmp; struct usb_device *usb_device_cmp;
jlong usb_device_cmp_addr = env->GetLongField(dev, usb_devFID_devStructAddr); jlong usb_device_cmp_addr = env->GetLongField(dev, usb_devFID_devStructAddr);
struct usb_bus *tmpBus; struct usb_bus *tmpBus;
for (tmpBus = busses; tmpBus; tmpBus = tmpBus->next) { for (tmpBus = busses; tmpBus; tmpBus = tmpBus->next) {
struct usb_device *device; struct usb_device *device;
for (device = tmpBus->devices; device; device = device->next) { for (device = tmpBus->devices; device; device = device->next) {
@@ -665,9 +665,10 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1control_1msg
{ {
clearLibusbJavaError(); clearLibusbJavaError();
jbyte *bytes = env->GetByteArrayElements(jbytes, NULL); jbyte *bytes = env->GetByteArrayElements(jbytes, NULL);
int retVal = usb_control_msg((usb_dev_handle *) dev_handle, requesttype, request, value, index, (char *) bytes, size, timeout); int num_bytes = usb_control_msg((usb_dev_handle *) dev_handle, requesttype, request, value, index, (char *) bytes, size, timeout);
env->SetByteArrayRegion(jbytes, 0, size, bytes); env->SetByteArrayRegion(jbytes, 0, size, bytes);
return retVal; env->ReleaseByteArrayElements(jbytes, bytes, 0);
return num_bytes;
} }
/* /*
@@ -746,7 +747,9 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1bulk_1write
{ {
clearLibusbJavaError(); clearLibusbJavaError();
jbyte *bytes = env->GetByteArrayElements(jbytes, NULL); jbyte *bytes = env->GetByteArrayElements(jbytes, NULL);
return usb_bulk_write((usb_dev_handle *) dev_handle, ep, (char *) bytes, size, timeout); int num_bytes = usb_bulk_write((usb_dev_handle *) dev_handle, ep, (char *) bytes, size, timeout);
env->ReleaseByteArrayElements(jbytes, bytes, 0);
return num_bytes;
} }
/* /*
@@ -759,11 +762,11 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1bulk_1read
{ {
clearLibusbJavaError(); clearLibusbJavaError();
char *bytes = (char *) malloc(size * sizeof(char)); char *bytes = (char *) malloc(size * sizeof(char));
int retVal = usb_bulk_read((usb_dev_handle *) dev_handle, ep, bytes, size, timeout); int num_bytes = usb_bulk_read((usb_dev_handle *) dev_handle, ep, bytes, size, timeout);
if (!bytes) { return retVal; } if (!bytes) { return num_bytes; }
env->SetByteArrayRegion(jbytes, 0, size, (jbyte *) bytes); env->SetByteArrayRegion(jbytes, 0, size, (jbyte *) bytes);
free(bytes); free(bytes);
return retVal; return num_bytes;
} }
/* /*
@@ -776,7 +779,9 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1interrupt_1write
{ {
clearLibusbJavaError(); clearLibusbJavaError();
jbyte *bytes = env->GetByteArrayElements(jbytes, NULL); jbyte *bytes = env->GetByteArrayElements(jbytes, NULL);
return usb_interrupt_write((usb_dev_handle *) dev_handle, ep, (char *) bytes, size, timeout); int num_bytes = usb_interrupt_write((usb_dev_handle *) dev_handle, ep, (char *) bytes, size, timeout);
env->ReleaseByteArrayElements(jbytes, bytes, 0);
return num_bytes;
} }
/* /*
@@ -789,11 +794,11 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1interrupt_1read
{ {
clearLibusbJavaError(); clearLibusbJavaError();
char *bytes = (char *) malloc(size * sizeof(char)); char *bytes = (char *) malloc(size * sizeof(char));
int retVal = usb_interrupt_read((usb_dev_handle *) dev_handle, ep, bytes, size, timeout); int num_bytes = usb_interrupt_read((usb_dev_handle *) dev_handle, ep, bytes, size, timeout);
if (!bytes) { return retVal; } if (!bytes) { return num_bytes; }
env->SetByteArrayRegion(jbytes, 0, size, (jbyte *) bytes); env->SetByteArrayRegion(jbytes, 0, size, (jbyte *) bytes);
free(bytes); free(bytes);
return retVal; return num_bytes;
} }
/* /*
@@ -803,7 +808,7 @@ JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1interrupt_1read
*/ */
JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1strerror JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1strerror
(JNIEnv *env, jclass obj){ (JNIEnv *env, jclass obj){
char *str; char *str;
// check for LibusbJava specific errors first // check for LibusbJava specific errors first
if (libusbJavaError != NULL) { if (libusbJavaError != NULL) {
@@ -812,10 +817,10 @@ JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1strerror
} else { } else {
str = usb_strerror(); str = usb_strerror();
} }
return env->NewStringUTF(str); return env->NewStringUTF(str);
} }
/* /*
* Class: ch_ntb_usb_LibusbJava * Class: ch_ntb_usb_LibusbJava
* Method: usb_error_no * Method: usb_error_no
@@ -823,7 +828,7 @@ JNIEXPORT jstring JNICALL Java_ch_ntb_usb_LibusbJava_usb_1strerror
*/ */
JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1error_1no JNIEXPORT jint JNICALL Java_ch_ntb_usb_LibusbJava_usb_1error_1no
(JNIEnv *env, jclass obj, jint java_error_no){ (JNIEnv *env, jclass obj, jint java_error_no){
switch (java_error_no) { switch (java_error_no) {
case 0: case 0:
return 0; return 0;

2
LibusbJava/common.rc
View File

@@ -20,7 +20,7 @@ BEGIN
VALUE "FileDescription", RC_PRODUCT_STR VALUE "FileDescription", RC_PRODUCT_STR
VALUE "FileVersion", RC_VERSION_STR VALUE "FileVersion", RC_VERSION_STR
VALUE "InternalName", RC_FILE_NAME_STR VALUE "InternalName", RC_FILE_NAME_STR
VALUE "LegalCopyright", "2005 spandi@users.sourceforge.net" VALUE "LegalCopyright", "2008 spandi@users.sourceforge.net"
VALUE "OriginalFilename",RC_FILE_NAME_STR VALUE "OriginalFilename",RC_FILE_NAME_STR
VALUE "ProductName", RC_PRODUCT_STR VALUE "ProductName", RC_PRODUCT_STR
VALUE "ProductVersion", RC_VERSION_STR VALUE "ProductVersion", RC_VERSION_STR

2
LibusbJava/resource.rc
View File

@@ -2,6 +2,6 @@
#define RC_FILE_SUB_TYPE VFT2_UNKNOWN #define RC_FILE_SUB_TYPE VFT2_UNKNOWN
#define RC_PRODUCT_STR "Java LibUsb-Win32 wrapper - DLL" #define RC_PRODUCT_STR "Java LibUsb-Win32 wrapper - DLL"
#define RC_FILE_NAME_STR "LibusbJava.dll" #define RC_FILE_NAME_STR "LibusbJava.dll"
#define RC_VERSION_STR "0.2.3.0" #define RC_VERSION_STR "0.2.4.0"
#include "common.rc" #include "common.rc"

2
LibusbJava/version.properties
View File

@@ -1,5 +1,5 @@
# NOTE: if the version is changed -> change the define in resource.rc # NOTE: if the version is changed -> change the define in resource.rc
version.major=0 version.major=0
version.minor=2 version.minor=2
version.micro=3 version.micro=4
version.nano=0 version.nano=0