Memory Leaks

Author: henrique-borba

kernel/calculation.c

@@ -228,13 +228,13 @@ CArray_Prod(CArray * self, int * axis, int rtype, MemoryPointer * out_ptr)
     ret = (CArray *)emalloc(sizeof(CArray));
     descr = (CArrayDescriptor*)emalloc(sizeof(CArrayDescriptor));
     arr = CArray_CheckAxis(self, axis, 0);
-    int index_jumps = self->strides[*axis]/self->descriptor->elsize;
 
     if(axis != NULL) {
         if(*axis >= CArray_NDIM(self)) {
             throw_axis_exception("Invalid axis for current matrix shape.");
             return NULL;
         }
+        int index_jumps = self->strides[*axis] / self->descriptor->elsize;
     }
 
     if (arr == NULL) {
@@ -262,7 +262,6 @@ CArray_Prod(CArray * self, int * axis, int rtype, MemoryPointer * out_ptr)
     if(axis == NULL) {
         descr->numElements = 1;
         ret = CArray_NewFromDescr_int(ret, descr, 0, NULL, NULL, NULL, 0, NULL, 1, 0);
-        CArray_Data_alloc(ret);
         if(rtype == TYPE_INTEGER_INT) {
             *((int*)total) = IDATA(self)[0];
             for(i = 1; i < CArray_DESCR(self)->numElements; i++) {

kernel/linalg.c

@@ -239,9 +239,6 @@ CArray_Matmul(CArray * ap1, CArray * ap2, CArray * out, MemoryPointer * ptr)
     CArrayIterator_FREE(it1);
     CArrayIterator_FREE(it2);
 
-    if(ptr != NULL) {
-        add_to_buffer(ptr, result, sizeof(CArray*));
-    }
     efree(dimensions);
     // Remove appended dimension
     result->ndim = ap1->ndim;
@@ -496,6 +493,7 @@ CArray_Det(CArray * a, MemoryPointer * out)
         efree(data);
     }
 
+    efree(ipiv);
     return rtn;
 fail:
     return NULL;
@@ -712,8 +710,8 @@ CArray_Svd(CArray * a, int full_matrices, int compute_uv, MemoryPointer * out)
         target = a;
     }
 
+    data = emalloc(sizeof(double) * CArray_SIZE(a));
     if (!CArray_CHKFLAGS(a, CARRAY_ARRAY_C_CONTIGUOUS)) {
-        data = emalloc(sizeof(double) * CArray_SIZE(a));
         linearize_DOUBLE_matrix(data, DDATA(target), target);
     } else {
         memcpy(data, DDATA(target), sizeof(double) * CArray_SIZE(target));

phpsci.c

@@ -525,7 +525,7 @@ PHP_METHOD(CArray, arcsin)
     ZEND_PARSE_PARAMETERS_END();
     ZVAL_TO_MEMORYPOINTER(target, &ptr, NULL);
     target_ca = CArray_FromMemoryPointer(&ptr);
-    ret = CArray_Tan(target_ca, &rtn_tr);
+    ret = CArray_Arcsin(target_ca, &rtn_tr);
 
     FREE_FROM_MEMORYPOINTER(&ptr);
     RETURN_MEMORYPOINTER(return_value, &rtn_tr);
@@ -542,7 +542,7 @@ PHP_METHOD(CArray, arccos)
     ZEND_PARSE_PARAMETERS_END();
     ZVAL_TO_MEMORYPOINTER(target, &ptr, NULL);
     target_ca = CArray_FromMemoryPointer(&ptr);
-    ret = CArray_Tan(target_ca, &rtn_tr);
+    ret = CArray_Arccos(target_ca, &rtn_tr);
 
     FREE_FROM_MEMORYPOINTER(&ptr);
     RETURN_MEMORYPOINTER(return_value, &rtn_tr);
@@ -559,7 +559,7 @@ PHP_METHOD(CArray, arctan)
     ZEND_PARSE_PARAMETERS_END();
     ZVAL_TO_MEMORYPOINTER(target, &ptr, NULL);
     target_ca = CArray_FromMemoryPointer(&ptr);
-    ret = CArray_Tan(target_ca, &rtn_tr);
+    ret = CArray_Arctan(target_ca, &rtn_tr);
 
     FREE_FROM_MEMORYPOINTER(&ptr);
     RETURN_MEMORYPOINTER(return_value, &rtn_tr);
@@ -1460,7 +1460,7 @@ PHP_METHOD(CArray, prod)
     long axis;
     int * axis_p;
     CArray * ret, * target_ca;
-    MemoryPointer ptr;
+    MemoryPointer ptr, rtn_ptr;
     ZEND_PARSE_PARAMETERS_START(1, 2)
             Z_PARAM_ZVAL(target)
             Z_PARAM_OPTIONAL
@@ -1475,9 +1475,11 @@ PHP_METHOD(CArray, prod)
     }
     ZVAL_TO_MEMORYPOINTER(target, &ptr, NULL);
     target_ca = CArray_FromMemoryPointer(&ptr);
-    ret = CArray_Prod(target_ca, axis_p, target_ca->descriptor->type_num, &ptr);
+    ret = CArray_Prod(target_ca, axis_p, target_ca->descriptor->type_num, &rtn_ptr);
     efree(axis_p);
-    RETURN_MEMORYPOINTER(return_value, &ptr);
+
+    FREE_FROM_MEMORYPOINTER(&ptr);
+    RETURN_MEMORYPOINTER(return_value, &rtn_ptr);
 }
 
 PHP_METHOD(CArray, cumprod)
@@ -1654,6 +1656,10 @@ PHP_METHOD(CArray, around)
         return;
     }
 
+    if (target_ptr.free == 1 || target_ptr.free == 2) {
+        CArrayDescriptor_INCREF(CArray_DESCR(rtn_ca));
+    }
+
     FREE_FROM_MEMORYPOINTER(&target_ptr);
     RETURN_MEMORYPOINTER(return_value, &rtn_ptr);
 }
@@ -2744,7 +2750,7 @@ static zend_function_entry carray_class_methods[] =
         PHP_ME(CArray, cosh, NULL, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
         PHP_ME(CArray, tanh, NULL, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
 
-        // STORAGAE
+        // STORAGE
         PHP_ME(CArray, save, NULL, ZEND_ACC_PUBLIC)
         PHP_ME(CArray, load, NULL, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)