Several leaks and bugs fixed (added new unit test)

Author: marcobambini

.gitignore

@@ -325,3 +325,5 @@ binding/GravityObjC/GravityObjC.xcodeproj/project.xcworkspace/xcshareddata/IDEWo
 gravity.xcodeproj/xcuserdata/marco.xcuserdatad/xcschemes/gravity.xcscheme
 *.xcscheme
 *.xcscheme
+gravity.xcodeproj/xcuserdata/marco.xcuserdatad/xcschemes/gravity.xcscheme
+*.d

src/compiler/gravity_codegen.c

@@ -77,6 +77,7 @@ static void report_error (gvisitor_t *self, gnode_t *node, const char *format, .
 
     // build error message
     char buffer[1024];
+    buffer[0] = 0;
     va_list arg;
     if (format) {
         va_start (arg, format);
@@ -2142,6 +2143,7 @@ gravity_function_t *gravity_codegen(gnode_t *node, gravity_delegate_t *delegate,
     marray_pop(data.context);
     assert(marray_size(data.context) == 0);
     marray_destroy(data.context);
+    marray_destroy(data.superfix);
 
     // in case of codegen errors explicity free code and return NULL
     if (visitor.nerr != 0) {ircode_free(code); f->bytecode = NULL;}

src/compiler/gravity_ircode.c

@@ -293,7 +293,7 @@ void ircode_dump (void *_code) {
         switch (n) {
             case 0: {
                 printf("%05d\t%s\n", line, opcode_name(op));
-            }
+            } break;
 
             case 1: {
                 printf("%05d\t%s %d\n", line, opcode_name(op), p1);

src/compiler/gravity_lexer.c

@@ -39,7 +39,7 @@ typedef enum {
 
 // LEXER macros
 #define NEXT                    lexer->buffer[lexer->offset++]; ++lexer->position; INC_COL
-#define PEEK_CURRENT            ((int)lexer->buffer[lexer->offset])
+#define PEEK_CURRENT            ((lexer->offset < lexer->length) ? (int)lexer->buffer[lexer->offset] : 0)
 #define PEEK_NEXT               ((lexer->offset < lexer->length) ? lexer->buffer[lexer->offset+1] : 0)
 #define PEEK_NEXT2              ((lexer->offset+1 < lexer->length) ? lexer->buffer[lexer->offset+2] : 0)
 #define INC_LINE                ++lexer->lineno; RESET_COL
@@ -184,9 +184,9 @@ static inline bool next_utf8(gravity_lexer_t *lexer, int *result) {
 
     switch(len) {
         case 1: break;
-        case 2: INC_OFFSET; INC_TOKBYTES; break;
-        case 3: INC_OFFSET; INC_OFFSET; INC_TOKBYTES; INC_TOKBYTES; break;
-        case 4: INC_OFFSET; INC_OFFSET; INC_OFFSET; INC_TOKBYTES; INC_TOKBYTES; INC_TOKBYTES; INC_POSITION; INC_TOKUTF8LEN; break;
+        case 2: if (IS_EOF) return false; INC_OFFSET; INC_TOKBYTES; break;
+        case 3: if (IS_EOF) return false; INC_OFFSET; if (IS_EOF) return false; INC_OFFSET; INC_TOKBYTES; INC_TOKBYTES; break;
+        case 4: if (IS_EOF) return false; INC_OFFSET; if (IS_EOF) return false; INC_OFFSET; if (IS_EOF) return false; INC_OFFSET; INC_TOKBYTES; INC_TOKBYTES; INC_TOKBYTES; INC_POSITION; INC_TOKUTF8LEN; break;
     }
 
     if (result) *result = c;
@@ -352,11 +352,14 @@ static gtoken_t lexer_scan_string(gravity_lexer_t *lexer) {
         // handle escaped characters
         if (c2 == '\\') {
             INC_OFFSET_POSITION;
-            INC_OFFSET_POSITION;
-            INC_TOKLEN;
             INC_TOKLEN;
 
             // sanity check
+            if (IS_EOF) return lexer_error(lexer, "Unexpected EOF inside a string literal");
+
+            INC_OFFSET_POSITION;
+            INC_TOKLEN;
+
             if (IS_EOF) return lexer_error(lexer, "Unexpected EOF inside a string literal");
             continue;
         }

src/compiler/gravity_optimizer.c

@@ -20,8 +20,8 @@
 #define IS_NEG(inst)                ((inst) && (inst->op == NEG))
 #define IS_NUM(inst)                ((inst) && (inst->op == LOADI))
 #define IS_MATH(inst)               ((inst) && (inst->op >= ADD) && (inst->op <= REM))
-#define IS_SKIP(inst)               (inst->tag == SKIP_TAG)
-#define IS_LABEL(inst)              (inst->tag == LABEL_TAG)
+#define IS_SKIP(inst)               ((inst) && (inst->tag == SKIP_TAG))
+#define IS_LABEL(inst)              ((inst) && (inst->tag == LABEL_TAG))
 #define IS_NOTNULL(inst)            (inst)
 #define IS_PRAGMA_MOVE_OPT(inst)    ((inst) && (inst->tag == PRAGMA_MOVE_OPTIMIZATION))
 
@@ -325,15 +325,23 @@ static bool optimize_const_instruction (inst_t *inst, inst_t *inst1, inst_t *ins
 
         case DIV:
             // don't optimize in case of division by 0
-            if ((int64_t)d2 == 0) return false;
-            if (type == DOUBLE_TAG) d = d1 / d2;
-            else n = n1 / n2;
+            if (type == DOUBLE_TAG) {
+                if (d2 == 0.0) return false;
+                d = d1 / d2;
+            } else {
+                if (n2 == 0) return false;
+                n = n1 / n2;
+            }
             break;
 
         case REM:
-            if ((int64_t)d2 == 0) return false;
-            if (type == DOUBLE_TAG) d = (double)((int64_t)d1 % (int64_t)d2);
-            else n = n1 % n2;
+            if (type == DOUBLE_TAG) {
+                if (d2 == 0.0) return false;
+                d = (double)((int64_t)d1 % (int64_t)d2);
+            } else {
+                if (n2 == 0) return false;
+                n = n1 % n2;
+            }
             break;
 
         default:

src/compiler/gravity_parser.c

@@ -168,6 +168,7 @@ static void report_error (gravity_parser_t *parser, error_type_t error_type, gto
 
     // build error message
     char buffer[1024];
+    buffer[0] = 0;
     va_list arg;
     if (format) {
         va_start (arg, format);

src/optionals/gravity_opt_env.c

@@ -35,9 +35,7 @@ static gravity_list_t               *argv = NULL;
  *
  */
 static bool gravity_env_get(gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {
-    #pragma unused(nargs)
-    
-    if(!VALUE_ISA_STRING(args[1])) {
+    if(nargs < 2 || !VALUE_ISA_STRING(args[1])) {
         RETURN_ERROR("Environment variable key must be a string.");
     }
 
@@ -63,9 +61,7 @@ static bool gravity_env_get(gravity_vm *vm, gravity_value_t *args, uint16_t narg
  * @retval  Weather this function was successful or not.
  */
 static bool gravity_env_set(gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {
-    #pragma unused(nargs)
-    
-    if(!VALUE_ISA_STRING(args[1]) || (!VALUE_ISA_STRING(args[2]) && !VALUE_ISA_NULL(args[2]))) {
+    if(nargs < 2 || !VALUE_ISA_STRING(args[1]) || (!VALUE_ISA_STRING(args[2]) && !VALUE_ISA_NULL(args[2]))) {
         RETURN_ERROR("Environment variable key and value must both be strings.");
     }
 

src/optionals/gravity_opt_file.c

@@ -56,7 +56,7 @@ static gravity_file_t *gravity_ifile_new (gravity_vm *vm, FILE *f) {
 
 static bool internal_file_size (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {
     // 1 parameter of type string is required
-    if (nargs != 2 && !VALUE_ISA_STRING(args[1])) {
+    if (nargs != 2 || !VALUE_ISA_STRING(args[1])) {
         RETURN_ERROR("A path parameter of type String is required.");
     }
 
@@ -67,7 +67,7 @@ static bool internal_file_size (gravity_vm *vm, gravity_value_t *args, uint16_t
 
 static bool internal_file_exists (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {
     // 1 parameter of type string is required
-    if (nargs != 2 && !VALUE_ISA_STRING(args[1])) {
+    if (nargs != 2 || !VALUE_ISA_STRING(args[1])) {
         RETURN_ERROR("A path parameter of type String is required.");
     }
 
@@ -78,7 +78,7 @@ static bool internal_file_exists (gravity_vm *vm, gravity_value_t *args, uint16_
 
 static bool internal_file_delete (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {
     // 1 parameter of type string is required
-    if (nargs != 2 && !VALUE_ISA_STRING(args[1])) {
+    if (nargs != 2 || !VALUE_ISA_STRING(args[1])) {
         RETURN_ERROR("A path parameter of type String is required.");
     }
 
@@ -89,7 +89,7 @@ static bool internal_file_delete (gravity_vm *vm, gravity_value_t *args, uint16_
 
 static bool internal_file_read (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {
     // 1 parameter of type string is required
-    if (nargs != 2 && !VALUE_ISA_STRING(args[1])) {
+    if (nargs != 2 || !VALUE_ISA_STRING(args[1])) {
         RETURN_ERROR("A path parameter of type String is required.");
     }
 
@@ -106,7 +106,7 @@ static bool internal_file_read (gravity_vm *vm, gravity_value_t *args, uint16_t
 
 static bool internal_file_write (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {
     // 2 parameters of type string are required
-    if (nargs != 3 && !VALUE_ISA_STRING(args[1]) && !VALUE_ISA_STRING(args[2])) {
+    if (nargs != 3 || !VALUE_ISA_STRING(args[1]) || !VALUE_ISA_STRING(args[2])) {
         RETURN_ERROR("A path parameter of type String and a String parameter are required.");
     }
 
@@ -119,7 +119,7 @@ static bool internal_file_write (gravity_vm *vm, gravity_value_t *args, uint16_t
 
 static bool internal_file_buildpath (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {
     // 2 parameters of type string are required
-    if (nargs != 3 && !VALUE_ISA_STRING(args[1]) && !VALUE_ISA_STRING(args[2])) {
+    if (nargs != 3 || !VALUE_ISA_STRING(args[1]) || !VALUE_ISA_STRING(args[2])) {
         RETURN_ERROR("A file and path parameters of type String are required.");
     }
 
@@ -137,7 +137,7 @@ static bool internal_file_buildpath (gravity_vm *vm, gravity_value_t *args, uint
 
 static bool internal_file_is_directory (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {
     // 1 parameter of type string is required
-    if (nargs != 2 && !VALUE_ISA_STRING(args[1])) {
+    if (nargs != 2 || !VALUE_ISA_STRING(args[1])) {
         RETURN_ERROR("A path parameter of type String is required.");
     }
 
@@ -148,7 +148,7 @@ static bool internal_file_is_directory (gravity_vm *vm, gravity_value_t *args, u
 
 static bool internal_file_directory_create (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {
     // 1 parameter of type string is required
-    if (nargs != 2 && !VALUE_ISA_STRING(args[1])) {
+    if (nargs != 2 || !VALUE_ISA_STRING(args[1])) {
         RETURN_ERROR("A path parameter of type String is required.");
     }
 
@@ -218,12 +218,12 @@ static bool internal_file_directory_scan (gravity_vm *vm, gravity_value_t *args,
     // optional bool 2nd parameter
     int nindex = 2;
     bool recursive = true;
-    if (VALUE_ISA_BOOL(args[2])) {
+    if (nargs > 2 && VALUE_ISA_BOOL(args[2])) {
         recursive = VALUE_AS_BOOL(args[2]);
         nindex = 3;
     }
-    
-    if (!VALUE_ISA_CLOSURE(args[nindex])) {
+
+    if (nargs <= (uint16_t)nindex || !VALUE_ISA_CLOSURE(args[nindex])) {
         RETURN_ERROR("A closure parameter is required.");
     }
 
@@ -280,7 +280,7 @@ static bool internal_file_iread (gravity_vm *vm, gravity_value_t *args, uint16_t
     // var data = file.read(N)
 
     // 1 parameter of type int is required
-    if (nargs < 1 && (!VALUE_ISA_INT(args[1]) && !VALUE_ISA_STRING(args[1]))) {
+    if (nargs < 2 || (!VALUE_ISA_INT(args[1]) && !VALUE_ISA_STRING(args[1]))) {
         RETURN_ERROR("A parameter of type Int or String is required.");
     }
 
@@ -344,8 +344,8 @@ static bool internal_file_iread (gravity_vm *vm, gravity_value_t *args, uint16_t
 static bool internal_file_iwrite (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {
     // var written = file.write(data)
 
-    // 1 parameter of type int is required
-    if (nargs < 1 && !VALUE_ISA_STRING(args[1])) {
+    // 1 parameter of type string is required
+    if (nargs < 2 || !VALUE_ISA_STRING(args[1])) {
         RETURN_ERROR("A parameter of type String is required.");
     }
 
@@ -360,7 +360,7 @@ static bool internal_file_iseek (gravity_vm *vm, gravity_value_t *args, uint16_t
     // var result = file.seek(offset, whence)
 
     // 2 parameters of type int are required
-    if (nargs != 3 && !VALUE_ISA_INT(args[1]) && !VALUE_ISA_INT(args[2])) {
+    if (nargs != 3 || !VALUE_ISA_INT(args[1]) || !VALUE_ISA_INT(args[2])) {
         RETURN_ERROR("An offset parameter of type Int and a whence parameter of type Int are required.");
     }
 

src/optionals/gravity_opt_json.c

@@ -133,8 +133,10 @@ static bool JSON_parse (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, u
     gravity_string_t *string = VALUE_AS_STRING(value);
     json_value *json = json_parse(string->s, string->len);
     if (!json) RETURN_VALUE(VALUE_FROM_NULL, rindex);
-    
-    RETURN_VALUE(JSON_value(vm, json), rindex);
+
+    gravity_value_t result = JSON_value(vm, json);
+    json_value_free(json);
+    RETURN_VALUE(result, rindex);
 }
 
 //static bool JSON_begin_object (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {

src/optionals/gravity_opt_math.c

@@ -223,6 +223,11 @@ static bool math_xrt (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uin
         RETURN_VALUE(VALUE_FROM_INT(0), rindex);
     }
 
+    // check for division by zero in 1.0/base
+    if ((VALUE_ISA_INT(base) && base.n == 0) || (VALUE_ISA_FLOAT(base) && base.f == 0.0)) {
+        RETURN_VALUE(VALUE_FROM_UNDEFINED, rindex);
+    }
+
     if (VALUE_ISA_INT(value) && VALUE_ISA_INT(base)) {
         gravity_float_t computed_value = (gravity_float_t)pow((gravity_float_t)value.n, 1.0/base.n);
         RETURN_VALUE(VALUE_FROM_FLOAT(computed_value), rindex);
@@ -238,7 +243,7 @@ static bool math_xrt (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uin
         RETURN_VALUE(VALUE_FROM_FLOAT(computed_value), rindex);
     }
 
-    if (VALUE_ISA_FLOAT(value) && VALUE_ISA_INT(base)) {
+    if (VALUE_ISA_FLOAT(value) && VALUE_ISA_FLOAT(base)) {
         gravity_float_t computed_value = (gravity_float_t)pow((gravity_float_t)value.f, 1.0/base.f);
         RETURN_VALUE(VALUE_FROM_FLOAT(computed_value), rindex);
     }
@@ -340,16 +345,14 @@ static bool math_floor (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, u
 }
 
 static int gcf(int x, int y) {
-    if (x == 0) {
-        return y;
-    }
+    if (x < 0) x = -x;
+    if (y < 0) y = -y;
+    if (x == 0) return y;
+    if (y == 0) return x;
     while (y != 0) {
-        if (x > y) {
-            x = x - y;
-        }
-        else {
-            y = y - x;
-        }
+        int t = y;
+        y = x % y;
+        x = t;
     }
     return x;
 }
@@ -372,7 +375,8 @@ static bool math_gcf (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uin
 }
 
 static int lcm(int x, int y) {
-    return x*y/gcf(x,y);
+    if (x == 0 || y == 0) return 0;
+    return (x / gcf(x, y)) * y;
 }
 
 static bool math_lcm (gravity_vm *vm, gravity_value_t *args, uint16_t nargs, uint32_t rindex) {