refs #159: fixed a memory leak problem.

Kray-G · Jan 25, 2021 · 1384f68 · 1384f68
1 parent 8246bb7
commit 1384f68
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/allocator.c b/src/allocator.c
@@ -201,6 +201,7 @@ static void gc_mark_fnc(kx_fnc_t *c)
         gc_mark_frm(c->lex);
     }
     gc_mark_val(&(c->val));
+    gc_mark_val(&(c->push));
 }
 
 static void gc_mark_frm(kx_frm_t *c)

diff --git a/src/ir_util.c b/src/ir_util.c
@@ -536,6 +536,7 @@ kx_context_t *compile_code(const char *code, int exc_in_err)
                 return NULL;
             }
         } else {
+            context_cleanup(ctx);
             return NULL;
         }
     }
@@ -658,8 +659,8 @@ void thread_free(void *pp)
     kx_thread_pack_t *p = (kx_thread_pack_t *)pp;
     if (p->r) {
         pthread_join(p->r, NULL);
-        kx_free(p);
     }
+    kx_free(p);
 }
 
 int System_threadIsRunning(int args, kx_frm_t *frmv, kx_frm_t *lexv, kx_context_t *ctx)
@@ -702,8 +703,10 @@ int System_joinThread(int args, kx_frm_t *frmv, kx_frm_t *lexv, kx_context_t *ct
         kx_thread_pack_t *p = (kx_thread_pack_t *)(val->value.av->p);
         if (p->r) {
             pthread_join(p->r, NULL);
+            p->r = 0;
             ret = p->value;
         }
+        thread_free(val->value.av->p);
         val->value.av->p = NULL;
     }
     KX_ADJST_STACK();