Ensure that JVM variable is not null before unloading

hedgecrw · hedgecrw · commit 1603368b53cc · 2023-07-08T16:53:36.000-05:00
diff --git a/src/main/c/Posix/SerialPort_Posix.c b/src/main/c/Posix/SerialPort_Posix.c
@@ -360,9 +360,10 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *reserved)
 JNIEXPORT void JNICALL Java_com_fazecast_jSerialComm_SerialPort_uninitializeLibrary(JNIEnv *env, jclass serialComm)
 {
 	// Call the JNI Unload function
-	JavaVM *jvm;
+	JavaVM *jvm = NULL;
 	(*env)->GetJavaVM(env, &jvm);
-	JNI_OnUnload(jvm, NULL);
+	if (jvm)
+		JNI_OnUnload(jvm, NULL);
 }
 
 JNIEXPORT jstring JNICALL Java_com_fazecast_jSerialComm_SerialPort_getNativeLibraryVersion(JNIEnv *env, jclass serialComm)
diff --git a/src/main/c/Windows/SerialPort_Windows.c b/src/main/c/Windows/SerialPort_Windows.c
@@ -573,9 +573,10 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *jvm, void *reserved)
 JNIEXPORT void JNICALL Java_com_fazecast_jSerialComm_SerialPort_uninitializeLibrary(JNIEnv *env, jclass serialComm)
 {
 	// Call the JNI Unload function
-	JavaVM *jvm;
+	JavaVM *jvm = NULL;
 	(*env)->GetJavaVM(env, &jvm);
-	JNI_OnUnload(jvm, NULL);
+	if (jvm)
+		JNI_OnUnload(jvm, NULL);
 }
 
 JNIEXPORT jstring JNICALL Java_com_fazecast_jSerialComm_SerialPort_getNativeLibraryVersion(JNIEnv *env, jclass serialComm)

Original file line number	Diff line number	Diff line change
`@@ -360,9 +360,10 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM jvm, void reserved)`
`360`	`360`	`JNIEXPORT void JNICALL Java_com_fazecast_jSerialComm_SerialPort_uninitializeLibrary(JNIEnv *env, jclass serialComm)`
`361`	`361`	`{`
`362`	`362`	`// Call the JNI Unload function`
`363`		`- JavaVM *jvm;`
	`363`	`+ JavaVM *jvm = NULL;`
`364`	`364`	`(*env)->GetJavaVM(env, &jvm);`
`365`		`- JNI_OnUnload(jvm, NULL);`
	`365`	`+ if (jvm)`
	`366`	`+ JNI_OnUnload(jvm, NULL);`
`366`	`367`	`}`
`367`	`368`
`368`	`369`	`JNIEXPORT jstring JNICALL Java_com_fazecast_jSerialComm_SerialPort_getNativeLibraryVersion(JNIEnv *env, jclass serialComm)`
Original file line number	Diff line number	Diff line change
`@@ -573,9 +573,10 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM jvm, void reserved)`
`573`	`573`	`JNIEXPORT void JNICALL Java_com_fazecast_jSerialComm_SerialPort_uninitializeLibrary(JNIEnv *env, jclass serialComm)`
`574`	`574`	`{`
`575`	`575`	`// Call the JNI Unload function`
`576`		`- JavaVM *jvm;`
	`576`	`+ JavaVM *jvm = NULL;`
`577`	`577`	`(*env)->GetJavaVM(env, &jvm);`
`578`		`- JNI_OnUnload(jvm, NULL);`
	`578`	`+ if (jvm)`
	`579`	`+ JNI_OnUnload(jvm, NULL);`
`579`	`580`	`}`
`580`	`581`
`581`	`582`	`JNIEXPORT jstring JNICALL Java_com_fazecast_jSerialComm_SerialPort_getNativeLibraryVersion(JNIEnv *env, jclass serialComm)`