mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

java: use cleanup handlers for structs (lists) as return values

Browse Source 
Filling some of their fields may cause the flow to skip to throw the
"out of memory" exception, and return immediately.  To avoid leaking the
struct, or struct list, from the C implementation, use a cleanup handler
so there is no need to manually clean it up.
This commit is contained in:
Pino Toscano
2017-03-06 13:25:48 +01:00
parent c5fa352087
commit 18ee68ad12
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
generator/java.ml
View File

@@ -696,13 +696,15 @@ throw_out_of_memory (JNIEnv *env, const char *msg)
pr " jobject jr;\n";
pr " jclass cl;\n";
pr " jfieldID fl;\n";
pr " struct guestfs_%s *r;\n" typ
pr " CLEANUP_FREE_%s struct guestfs_%s *r = NULL;\n"
(String.uppercase_ascii typ) typ
| RStructList (_, typ) ->
pr " jobjectArray jr;\n";
pr " jclass cl;\n";
pr " jfieldID fl;\n";
pr " jobject jfl;\n";
pr " struct guestfs_%s_list *r;\n" typ
pr " CLEANUP_FREE_%s_LIST struct guestfs_%s_list *r = NULL;\n"
(String.uppercase_ascii typ) typ
| RBufferOut _ ->
pr " jstring jr;\n";
pr " char *r;\n";
@@ -1008,7 +1010,6 @@ and generate_java_struct_return typ jtyp cols =
pr " fl = (*env)->GetFieldID (env, cl, \"%s\", \"C\");\n" name;
pr " (*env)->SetCharField (env, jr, fl, r->%s);\n" name;
) cols;
pr " guestfs_free_%s (r);\n" typ;
pr " return jr;\n"
and generate_java_struct_list_return typ jtyp cols =
@@ -1069,7 +1070,6 @@ and generate_java_struct_list_return typ jtyp cols =
pr " (*env)->SetObjectArrayElement (env, jr, i, jfl);\n";
pr " }\n";
pr "\n";
pr " guestfs_free_%s_list (r);\n" typ;
pr " return jr;\n"
and generate_java_makefile_inc () =