Ensure that JVM variable is not null before unloading

Fazecast · Jul 8, 2023 · 1603368 · 1603368
1 parent 39d54c4
commit 1603368
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
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)