rusefi
/
java-simple-serial-connector
mirror of https://github.com/rusefi/java-simple-serial-connector.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows native lib: port name string cancatenation fix, to prevent exception access violation

This commit is contained in:
Alexey Sokolov 2013-03-12 11:37:22 +03:00
parent 7395dd0d80
commit 7dddbec01d
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cpp/windows/jssc.c++
View File

@ -25,7 +25,9 @@
#include <jni.h> #include <jni.h>
#include <stdlib.h> #include <stdlib.h>
#include <windows.h> #include <windows.h>
#include "jssc_SerialNativeInterface.h" #include "../jssc_SerialNativeInterface.h"
#include <iostream>
/* /*
* Port opening. * Port opening.
@ -33,9 +35,15 @@
JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_openPort(JNIEnv *env, jobject object, jstring portName){ JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_openPort(JNIEnv *env, jobject object, jstring portName){
char prefix[] = "\\\\.\\"; char prefix[] = "\\\\.\\";
const char* port = env->GetStringUTFChars(portName, JNI_FALSE); const char* port = env->GetStringUTFChars(portName, JNI_FALSE);
strcat(prefix, port);
//-> Since 2.1.0 string concat fix
char portFullName[strlen(prefix) + strlen(port) + 1];
strcpy(portFullName, prefix);
strcat(portFullName, port);
//<- Since 2.1.0
HANDLE hComm; HANDLE hComm;
hComm = CreateFile(prefix, hComm = CreateFile(portFullName,
GENERIC_READ | GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE,
0, 0,
0, 0,
@ -43,6 +51,7 @@ JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_openPort(JNIEnv *env, job
FILE_FLAG_OVERLAPPED, FILE_FLAG_OVERLAPPED,
0); 0);
env->ReleaseStringUTFChars(portName, port); env->ReleaseStringUTFChars(portName, port);
//since 0.9 -> //since 0.9 ->
if(hComm == INVALID_HANDLE_VALUE){ if(hComm == INVALID_HANDLE_VALUE){
DWORD errorValue = GetLastError(); DWORD errorValue = GetLastError();