rusefi
/
jSerialComm
mirror of https://github.com/rusefi/jSerialComm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix unsigned integer comparison bug

This commit is contained in:
Will Hedgecock 2021-12-17 13:14:58 -06:00
parent 4a8d6c8827
commit 9a576ea145
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/c/Windows/SerialPort_Windows.c
View File

@ -170,7 +170,7 @@ JNIEXPORT jobjectArray JNICALL Java_com_fazecast_jSerialComm_SerialPort_getCommP
{ {
if (wcsstr(locationString, L"Hub")) if (wcsstr(locationString, L"Hub"))
hubNumber = _wtoi(wcschr(wcsstr(locationString, L"Hub"), L'#') + 1); hubNumber = _wtoi(wcschr(wcsstr(locationString, L"Hub"), L'#') + 1);
if ((portNumber < 0) && wcsstr(locationString, L"Port")) if ((portNumber == -1) && wcsstr(locationString, L"Port"))
{ {
wchar_t *portString = wcschr(wcsstr(locationString, L"Port"), L'#') + 1; wchar_t *portString = wcschr(wcsstr(locationString, L"Port"), L'#') + 1;
if (portString) if (portString)
@ -184,11 +184,11 @@ JNIEXPORT jobjectArray JNICALL Java_com_fazecast_jSerialComm_SerialPort_getCommP
} }
free(locationString); free(locationString);
} }
if (busNumber < 0) if (busNumber == -1)
busNumber = 0; busNumber = 0;
if (hubNumber < 0) if (hubNumber == -1)
hubNumber = 0; hubNumber = 0;
if (portNumber < 0) if (portNumber == -1)
portNumber = 0; portNumber = 0;
locationString = (wchar_t*)malloc(32*sizeof(wchar_t)); locationString = (wchar_t*)malloc(32*sizeof(wchar_t));
_snwprintf(locationString, 32, L"%d-%d.%d", busNumber, hubNumber, portNumber); _snwprintf(locationString, 32, L"%d-%d.%d", busNumber, hubNumber, portNumber);

BIN
src/main/resources/Windows/aarch64/jSerialComm.dll
View File

Binary file not shown.

BIN
src/main/resources/Windows/armv7/jSerialComm.dll
View File

Binary file not shown.

BIN
src/main/resources/Windows/x86/jSerialComm.dll
View File

Binary file not shown.

BIN
src/main/resources/Windows/x86_64/jSerialComm.dll
View File

Binary file not shown.

8
src/test/c/testEnumerateWindows.c
View File

@ -113,7 +113,7 @@ void getPortsWindows(void)
{ {
if (wcsstr(locationString, L"Hub")) if (wcsstr(locationString, L"Hub"))
hubNumber = _wtoi(wcschr(wcsstr(locationString, L"Hub"), L'#') + 1); hubNumber = _wtoi(wcschr(wcsstr(locationString, L"Hub"), L'#') + 1);
if ((portNumber < 0) && wcsstr(locationString, L"Port")) if ((portNumber == -1) && wcsstr(locationString, L"Port"))
{ {
wchar_t *portString = wcschr(wcsstr(locationString, L"Port"), L'#') + 1; wchar_t *portString = wcschr(wcsstr(locationString, L"Port"), L'#') + 1;
if (portString) if (portString)
@ -127,11 +127,11 @@ void getPortsWindows(void)
} }
free(locationString); free(locationString);
} }
if (busNumber < 0) if (busNumber == -1)
busNumber = 0; busNumber = 0;
if (hubNumber < 0) if (hubNumber == -1)
hubNumber = 0; hubNumber = 0;
if (portNumber < 0) if (portNumber == -1)
portNumber = 0; portNumber = 0;
locationString = (wchar_t*)malloc(32*sizeof(wchar_t)); locationString = (wchar_t*)malloc(32*sizeof(wchar_t));
_snwprintf(locationString, 32, L"%d-%d.%d", busNumber, hubNumber, portNumber); _snwprintf(locationString, 32, L"%d-%d.%d", busNumber, hubNumber, portNumber);