jni: avoid memory leaks

Signed-off-by: Alexander Bezzubov <[email protected]>

Author: bzz

src/main/native/org_bblfsh_client_v2_libuast_Libuast.cc

@@ -633,7 +633,7 @@ Java_org_bblfsh_client_v2_libuast_Libuast_00024UastIter_nativeInit(
   }
 
   // global ref will be deleted by Interface destructor on ctx deletion
-  auto it = ctx->Iterate(env->NewGlobalRef(jnode), (TreeOrder)order);
+  auto it = ctx->Iterate(jnode, (TreeOrder)order);
 
   // this.iter = it;
   setHandle<uast::Iterator<Node *>>(env, self, it, "iter");
@@ -754,8 +754,7 @@ JNIEXPORT jobject JNICALL Java_org_bblfsh_client_v2_Context_filter(
 
   uast::Iterator<Node *> *it = nullptr;
   try {
-    // global ref will be deleted by Interface destructor on ctx deletion
-    it = ctx->Filter(env->NewGlobalRef(jnode), query);
+    it = ctx->Filter(jnode, query);
   } catch (const std::exception &e) {
     ThrowByName(env, CLS_RE, e.what());
     return nullptr;
@@ -819,8 +818,10 @@ JNIEXPORT jobject JNICALL Java_org_bblfsh_client_v2_ContextExt_encode(
 JNIEXPORT void JNICALL
 Java_org_bblfsh_client_v2_ContextExt_dispose(JNIEnv *env, jobject self) {
   ContextExt *p = getHandle<ContextExt>(env, self, nativeContext);
-  setHandle<ContextExt>(env, self, 0, nativeContext);
-  delete p;
+  if (!p) {
+    delete p;
+    setHandle<ContextExt>(env, self, 0, nativeContext);
+  }
 }
 
 // ==========================================

src/test/scala/org/bblfsh/client/v2/libuast/IteratorManagedTest.scala

@@ -19,7 +19,7 @@ class IteratorManagedTest extends FlatSpec
     ))
 
   after {
-    iter.nativeDispose() // FIXME: rename to .dispose()
+    iter.close()
   }
 
   "Managed UAST iterator" should "return non-empty results on JVM objects" in {
@@ -77,6 +77,8 @@ class IteratorManagedTest extends FlatSpec
     val poActual = Seq("root", "son1", "son1_1", "son1_2", "son2", "son2_1", "son2_2")
     nodes should have size (poActual.size)
     nodes shouldEqual poActual
+
+    preIter.close()
   }
 
   "Managed UAST iterator" should "return nodes in PostOrder" in {
@@ -86,6 +88,8 @@ class IteratorManagedTest extends FlatSpec
     val poActual = Seq("son1_1", "son1_2", "son1", "son2_1", "son2_2", "son2", "root")
     nodes should have size (poActual.size)
     nodes shouldEqual poActual
+
+    postIter.close()
   }
 
   // TODO(#108) more tests coverage for other iteration orders, refactor to a table-driven test