From 41e1980f835b821f17fd36eb0bc8bb31cd215634 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Thu, 20 Mar 2014 13:33:17 +0000
Subject: [PATCH] fix memory leaks

---
 library/dialect/swi/fli/swi.c | 12 +++++++++---
 library/dialect/swi/fli/swi.h |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/library/dialect/swi/fli/swi.c b/library/dialect/swi/fli/swi.c
index ea9159ea2..9d1e8c91f 100755
--- a/library/dialect/swi/fli/swi.c
+++ b/library/dialect/swi/fli/swi.c
@@ -1001,7 +1001,8 @@ X_API int PL_throw(term_t exception)
 {
   CACHE_REGS
   YAP_Throw(Yap_GetFromSlot(exception PASS_REGS));
-  longjmp(LOCAL_execution->q_env, 0);
+  if (LOCAL_execution)
+    longjmp(LOCAL_execution->q_env, 0);
   return 0;
 }
 
@@ -2235,6 +2236,7 @@ X_API qid_t PL_open_query(module_t ctx, int flags, predicate_t p, term_t t0)
 
   /* ignore flags  and module for now */
   qid_t new = (qid_t)Yap_AllocCodeSpace(sizeof(struct open_query_struct));
+  new->oq = LOCAL_execution;
   LOCAL_execution = new;
   new->q_open=1;
   new->q_state=0;
@@ -2268,9 +2270,12 @@ X_API int PL_next_solution(qid_t qi)
 
 X_API void PL_cut_query(qid_t qi)
 {
+  CACHE_REGS
+
   if (qi->q_open != 1 || qi->q_state == 0) return;
   YAP_LeaveGoal(FALSE, &qi->q_h);
   qi->q_open = 0;
+  LOCAL_execution = qi->oq;
   Yap_FreeCodeSpace( (char *)qi );
 }
 
@@ -2287,6 +2292,7 @@ X_API void PL_close_query(qid_t qi)
   }
   YAP_LeaveGoal(FALSE, &qi->q_h);
   qi->q_open = 0;
+  LOCAL_execution = qi->oq;
   Yap_FreeCodeSpace( (char *)qi );
 }
 
@@ -2611,9 +2617,9 @@ PL_set_engine(PL_engine_t engine, PL_engine_t *old)
     nwid = ((struct worker_local *)engine)->ThreadHandle_.id;
   }
 
-  pthread_mutex_lock(&(REMOTE_ThreadHandle(nwid).tlock));
+  MUTEX_LOCK(&(REMOTE_ThreadHandle(nwid).tlock));
   if (REMOTE_ThreadHandle(nwid).ref_count) {
-    pthread_mutex_unlock(&(REMOTE_ThreadHandle(nwid).tlock));
+    MUTEX_UNLOCK(&(REMOTE_ThreadHandle(nwid).tlock));
     if (cwid != nwid) {
       return PL_ENGINE_INUSE;
     }
diff --git a/library/dialect/swi/fli/swi.h b/library/dialect/swi/fli/swi.h
index 2ac8cfb59..3dcec4810 100644
--- a/library/dialect/swi/fli/swi.h
+++ b/library/dialect/swi/fli/swi.h
@@ -10,6 +10,7 @@ typedef struct open_query_struct {
   jmp_buf q_env;
   int q_flags;
   YAP_dogoalinfo q_h;
+  struct open_query_struct *oq;
 } open_query;
 
 #define addr_hash(V) (((CELL) (V)) >> 4 & (N_SWI_HASH-1))