GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed rare memory leak in the Java bindings

Browse Source
This commit is contained in:
kr.angelov
2014-07-02 07:06:51 +00:00
parent 064cf03005
commit 4a7055e994
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/runtime/java/jpgf.c
View File

@@ -487,14 +487,16 @@ Java_org_grammaticalframework_pgf_Concr_linearize(JNIEnv* env, jobject self, job
pgf_linearize(get_ref(env, self), gu_variant_from_ptr((void*) get_ref(env, jexpr)), out, err); pgf_linearize(get_ref(env, self), gu_variant_from_ptr((void*) get_ref(env, jexpr)), out, err);
if (!gu_ok(err)) { if (!gu_ok(err)) {
if (gu_exn_caught(err) == gu_type(PgfLinNonExist)) if (gu_exn_caught(err) == gu_type(PgfLinNonExist)) {
gu_pool_free(tmp_pool);
return NULL; return NULL;
else if (gu_exn_caught(err) == gu_type(PgfExn)) { } else if (gu_exn_caught(err) == gu_type(PgfExn)) {
GuString msg = (GuString) gu_exn_caught_data(err); GuString msg = (GuString) gu_exn_caught_data(err);
throw_string_exception(env, "org/grammaticalframework/pgf/PGFError", msg); throw_string_exception(env, "org/grammaticalframework/pgf/PGFError", msg);
} else { } else {
throw_string_exception(env, "org/grammaticalframework/pgf/PGFError", "The expression cannot be linearized"); throw_string_exception(env, "org/grammaticalframework/pgf/PGFError", "The expression cannot be linearized");
} }
gu_pool_free(tmp_pool);
return NULL; return NULL;
} }
@@ -540,6 +542,7 @@ Java_org_grammaticalframework_pgf_Concr_tabularLinearize(JNIEnv* env, jobject se
} else { } else {
throw_string_exception(env, "org/grammaticalframework/pgf/PGFError", "The expression cannot be concretized"); throw_string_exception(env, "org/grammaticalframework/pgf/PGFError", "The expression cannot be concretized");
} }
gu_pool_free(tmp_pool);
return NULL; return NULL;
} }
@@ -755,7 +758,7 @@ jpgf_literal_callback_match(PgfLiteralCallback* self,
JPgfLiteralCallback* callback = gu_container(self, JPgfLiteralCallback, callback); JPgfLiteralCallback* callback = gu_container(self, JPgfLiteralCallback, callback);
JNIEnv *env; JNIEnv *env;
(*cachedJVM)->AttachCurrentThread(cachedJVM, (void **) &env, NULL); (*cachedJVM)->AttachCurrentThread(cachedJVM, &env, NULL);
jstring jsentence = gu2j_string(env, sentence); jstring jsentence = gu2j_string(env, sentence);
size_t joffset = gu2j_string_offset(sentence, *poffset); size_t joffset = gu2j_string_offset(sentence, *poffset);
@@ -819,7 +822,7 @@ jpgf_token_prob_enum_fin(GuFinalizer* self)
JPgfTokenProbEnum* en = gu_container(self, JPgfTokenProbEnum, fin); JPgfTokenProbEnum* en = gu_container(self, JPgfTokenProbEnum, fin);
JNIEnv *env; JNIEnv *env;
(*cachedJVM)->AttachCurrentThread(cachedJVM, (void **) &env, NULL); (*cachedJVM)->AttachCurrentThread(cachedJVM, &env, NULL);
(*env)->DeleteGlobalRef(env, en->jiterator); (*env)->DeleteGlobalRef(env, en->jiterator);
} }
@@ -833,7 +836,7 @@ jpgf_literal_callback_predict(PgfLiteralCallback* self,
JPgfLiteralCallback* callback = gu_container(self, JPgfLiteralCallback, callback); JPgfLiteralCallback* callback = gu_container(self, JPgfLiteralCallback, callback);
JNIEnv *env; JNIEnv *env;
(*cachedJVM)->AttachCurrentThread(cachedJVM, (void **) &env, NULL); (*cachedJVM)->AttachCurrentThread(cachedJVM, &env, NULL);
jstring jprefix = gu2j_string(env, prefix); jstring jprefix = gu2j_string(env, prefix);
jobject jiterator = (*env)->CallObjectMethod(env, callback->jcallback, callback->predict_methodId, lin_idx, jprefix); jobject jiterator = (*env)->CallObjectMethod(env, callback->jcallback, callback->predict_methodId, lin_idx, jprefix);
@@ -856,7 +859,7 @@ jpgf_literal_callback_fin(GuFinalizer* self)
JPgfLiteralCallback* callback = gu_container(self, JPgfLiteralCallback, fin); JPgfLiteralCallback* callback = gu_container(self, JPgfLiteralCallback, fin);
JNIEnv *env; JNIEnv *env;
(*cachedJVM)->AttachCurrentThread(cachedJVM, (void **) &env, NULL); (*cachedJVM)->AttachCurrentThread(cachedJVM, &env, NULL);
(*env)->DeleteGlobalRef(env, callback->jcallback); (*env)->DeleteGlobalRef(env, callback->jcallback);
} }