COMMON: fix memory leak

Author: chrisws

src/common/brun.c

@@ -1263,6 +1263,7 @@ int brun_create_task(const char *filename, byte *preloaded_bc, int libf) {
       cp += sizeof(bc_lib_rec_t);
     }
   }
+
   // build import-symbol table
   if (prog_symcount) {
     prog_symtable = (bc_symbol_rec_t *)malloc(prog_symcount * sizeof(bc_symbol_rec_t));
@@ -1271,21 +1272,22 @@ int brun_create_task(const char *filename, byte *preloaded_bc, int libf) {
       cp += sizeof(bc_symbol_rec_t);
     }
   }
+
   // create system stack
   prog_stack_alloc = SB_EXEC_STACK_SIZE;
   prog_stack = malloc(sizeof(stknode_t) * prog_stack_alloc);
   prog_stack_count = 0;
   prog_timer = NULL;
 
   // create eval's stack
-  eval_size = 64;
+  eval_size = SB_EVAL_STACK_SIZE;
   eval_stk = malloc(sizeof(var_t) * eval_size);
+  memset(eval_stk, 0, sizeof(var_t) * eval_size);
   eval_sp = 0;
 
   // initialize the rest tasks globals
   prog_error = 0;
   prog_line = 0;
-
   prog_dp = data_org = hdr.data_ip;
   prog_length = hdr.bc_count;
   prog_source = cp;
@@ -1385,7 +1387,6 @@ int brun_create_task(const char *filename, byte *preloaded_bc, int libf) {
 int exec_close_task() {
   word i;
   stknode_t node;
-
   if (ctask->bytecode) {
     // clean up - format list
     free_format();
@@ -1402,15 +1403,14 @@ int exec_close_task() {
     free(prog_stack);
     // clean up - variables
     for (i = 0; i < (int) prog_varcount; i++) {
-      int j, shared;
       // do not free imported variables
-      shared = -1;
+      int shared = -1;
+      int j;
       for (j = 0; j < prog_symcount; j++) {
-        if (prog_symtable[j].type == stt_variable) {
-          if (prog_symtable[j].var_id == i) {
-            shared = i;
-            break;
-          }
+        if (prog_symtable[j].type == stt_variable &&
+            prog_symtable[j].var_id == i) {
+          shared = j;
+          break;
         }
       }
 
@@ -1503,8 +1503,13 @@ void exec_sync_variables(int dir) {
         activate_task(ps->task_id);
         vp = tvar[us->vid];
 
+        // pointer assignment (shared var_t pointer)
         activate_task(tid);
-        tvar[ps->var_id] = vp;  // pointer assignment (shared var_t pointer)
+        if (tvar[ps->var_id] != vp) {
+          v_free(tvar[ps->var_id]);
+          free(tvar[ps->var_id]);
+        }
+        tvar[ps->var_id] = vp;
       } else {
         activate_task(tid);
         vp = tvar[ps->var_id];

src/common/eval.c

@@ -724,9 +724,12 @@ static inline void eval_push(var_t *r) {
   // expression-stack resize
   eval_sp++;
   if (eval_sp == eval_size) {
-    eval_size += 64;
+    eval_size += SB_EVAL_STACK_SIZE;
     eval_stk = realloc(eval_stk, sizeof(var_t) * eval_size);
-    // rt_raise("EVAL: STACK OVERFLOW");
+    int i;
+    for (i = eval_sp; i < eval_size; i++) {
+      v_init(&eval_stk[i]);
+    }
   }
 }
 

src/common/scan.c

@@ -4003,8 +4003,7 @@ void comp_preproc_unit_path(char *p) {
         *up++ = *p++;
       }
       *up = '\0';
-      sprintf(comp_bc_temp, "UNITPATH=%s", upath);
-      putenv(strdup(comp_bc_temp));
+      setenv("UNITPATH", upath, 1);
     }
   }
 }
@@ -4365,7 +4364,7 @@ byte_code comp_create_bin() {
 
     // unit header
     memcpy(&uft.sign, "SBUn", 4);
-    uft.version = 1;
+    uft.version = SB_DWORD_VER;
 
     strcpy(uft.base, comp_unit_name);
     uft.sym_count = comp_expcount;

src/common/sys.h

@@ -89,7 +89,8 @@ typedef long int var_int_t;
 #define SB_KEYWORD_SIZE     128
 #define SB_SOURCELINE_SIZE  65536 // compiler
 #define SB_TEXTLINE_SIZE    8192  // RTL
-#define SB_EXEC_STACK_SIZE  256 // executor's stack size
+#define SB_EXEC_STACK_SIZE  256   // executor's stack size
+#define SB_EVAL_STACK_SIZE  16    // evaluation stack size
 #define SB_PI               3.14159265358979323846
 
 // STD MACROS

src/common/units.c

@@ -142,10 +142,8 @@ int open_unit(const char *file) {
   }
 
   // compilation required
-  if (comp_rq) {
-    if (!comp_compile(bas_file)) {
-      return -1;
-    }
+  if (comp_rq && !comp_compile(bas_file)) {
+    return -1;
   }
 
   // open unit
@@ -155,10 +153,12 @@ int open_unit(const char *file) {
   }
 
   // read file header
-  read(h, &u.hdr, sizeof(unit_file_t));
-  if (memcmp(&u.hdr.sign, "SBUn", 4) != 0) {
+  int nread = read(h, &u.hdr, sizeof(unit_file_t));
+  if (nread != sizeof(unit_file_t) ||
+      u.hdr.version != SB_DWORD_VER ||
+      memcmp(&u.hdr.sign, "SBUn", 4) != 0) {
     close(h);
-    return -2;
+    return -1;
   }
 
   // load symbol-table