Skip to content

SerialImp.c:getRegistryString() - make thread-safe #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dilyanpalauzov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SerialImp.c:getRegistryString() - make thread-safe #265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/main/c/src/SerialImp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4650,15 +4650,15 @@ createSerialIterator(io_iterator_t *serialIterator)
char *
getRegistryString(io_object_t sObj, char *propName)
{
static char resultStr[256];
char* resultStr = malloc(256);
CFTypeRef nameCFstring;
resultStr[0] = 0;
nameCFstring = IORegistryEntryCreateCFProperty(sObj,
CFStringCreateWithCString(kCFAllocatorDefault, propName, kCFStringEncodingASCII),
kCFAllocatorDefault, 0);
if (nameCFstring)
{
CFStringGetCString(nameCFstring, resultStr, sizeof(resultStr), kCFStringEncodingASCII);
CFStringGetCString(nameCFstring, resultStr, 256, kCFStringEncodingASCII);
CFRelease(nameCFstring);
}
return resultStr;
Expand Down Expand Up @@ -4702,12 +4702,15 @@ registerKnownSerialPorts(JNIEnv *env, jobject jobj, jint portType) /* dima */
{
/* begin dima */
jstring tempJstring;
tempJstring = (*env)->NewStringUTF(env,getRegistryString(theObject, kIODialinDeviceKey));
char* temp = getRegistryString(theObject, kIODialinDeviceKey);
tempJstring = (*env)->NewStringUTF(env,temp);
free(temp);
(*env)->CallStaticVoidMethod(env, cls, mid,tempJstring,portType,jobj);/* dima */
(*env)->DeleteLocalRef(env,tempJstring);
numPorts++;

tempJstring = (*env)->NewStringUTF(env,getRegistryString(theObject, kIOCalloutDeviceKey));
temp = getRegistryString(theObject, kIOCalloutDeviceKey);
tempJstring = (*env)->NewStringUTF(env,temp);
free(temp);
(*env)->CallStaticVoidMethod(env, cls, mid,tempJstring,portType,jobj);/* dima */
(*env)->DeleteLocalRef(env,tempJstring);
numPorts++;
Expand Down Expand Up @@ -4775,7 +4778,7 @@ JNIEXPORT jboolean JNICALL RXTXCommDriver(isPortPrefixValid)(JNIEnv *env,
jobject jobj, jstring tty_name)
{
jboolean result;
static struct stat mystat;
struct stat mystat;
char teststring[256];
int fd,i;
const char *name = (*env)->GetStringUTFChars(env, tty_name, 0);
Expand Down