mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-15 18:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

The nat object may be null in nativeDestroy.

Browse Source
This commit is contained in:
Reece H. Dunn
2013-05-08 15:50:57 +01:00
parent 72bfb4205f
commit 7ec13c5558
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/jni/jni/eSpeakService.cpp
+9 -6
View File
@@ -127,7 +127,7 @@ JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeClassInit(
JNIEXPORT jboolean
JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeCreate(
JNIEnv *env, jobject object, jstring path) {
if (DEBUG) LOGV("%s", __FUNCTION__);
if (DEBUG) LOGV("%s [env=%p, object=%p]", __FUNCTION__, env, object);
native_data_t *nat = new native_data_t;
if (nat == NULL) {
@@ -151,12 +151,15 @@ JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeCreate(
JNIEXPORT jboolean
JNICALL Java_com_reecedunn_espeak_SpeechSynthesis_nativeDestroy(
JNIEnv *env, jobject object) {
if (DEBUG) LOGV("%s", __FUNCTION__);
if (DEBUG) LOGV("%s [env=%p, object=%p]", __FUNCTION__, env, object);
native_data_t *nat = getNativeData(env, object);
env->DeleteWeakGlobalRef(nat->object);
delete nat;
if (nat) {
env->DeleteWeakGlobalRef(nat->object);
delete nat;
} else {
env->DeleteWeakGlobalRef(object);
}
return JNI_TRUE;
}