memory leaks in hdf5 module

test_run hdf5
test_run("hdf5",[],"mode_nwni_profiling")

Change-Id: Iab19db68723227debf623a61b946075ac6b530dd

diff --git a/scilab/modules/api_scilab/src/cpp/api_poly.cpp b/scilab/modules/api_scilab/src/cpp/api_poly.cpp
index c959ca1..d064c8f 100644 (file)
--- a/scilab/modules/api_scilab/src/cpp/api_poly.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_poly.cpp
@@ -284,6 +284,7 @@ SciErr createCommonNamedMatrixOfPoly(void* _pvCtx, const char* _pstName, char* _
             pD->setImg(_pdblImg[i]);
         }
         pP->setCoef(i, pD);
+        delete pD;
     }
 
     wchar_t* pwstName = to_wide_string(_pstName);

diff --git a/scilab/modules/api_scilab/src/cpp/api_sparse.cpp b/scilab/modules/api_scilab/src/cpp/api_sparse.cpp
index f64910e..418ee0a 100644 (file)
--- a/scilab/modules/api_scilab/src/cpp/api_sparse.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_sparse.cpp
@@ -122,6 +122,11 @@ SciErr getCommonSparseMatrix(void* _pvCtx, int* _piAddress, int _iComplex, int*
     {
         *_pdblImg = pI;
     }
+    else
+    {
+        FREE(pI);
+    }
+
     return sciErr;
 }
 

diff --git a/scilab/modules/ast/src/cpp/ast/run_CallExp.hpp b/scilab/modules/ast/src/cpp/ast/run_CallExp.hpp
index 2d587f9..ada8530 100644 (file)
--- a/scilab/modules/ast/src/cpp/ast/run_CallExp.hpp
+++ b/scilab/modules/ast/src/cpp/ast/run_CallExp.hpp
@@ -40,95 +40,101 @@ void RunVisitorT<T>::visitprivate(const CallExp &e)
 
         //get function arguments
         exps_t args = e.getArgs();
-        for (auto arg : args)
+        try
         {
-            if (arg->isAssignExp())
+            for (auto arg : args)
             {
-                AssignExp* pAssign = static_cast<AssignExp*>(arg);
-                //optional parameter
-                Exp* pL = &pAssign->getLeftExp();
-                if (!pL->isSimpleVar())
+                if (arg->isAssignExp())
                 {
-                    clearResult();
-                    cleanOpt(opt);
-                    cleanIn(in, out);
-
-                    std::wostringstream os;
-                    os << _W("left side of optional parameter must be a variable") << std::endl;
-                    throw ast::InternalError(os.str(), 999, e.getLocation());
-                }
+                    AssignExp* pAssign = static_cast<AssignExp*>(arg);
+                    //optional parameter
+                    Exp* pL = &pAssign->getLeftExp();
+                    if (!pL->isSimpleVar())
+                    {
+                        std::wostringstream os;
+                        os << _W("left side of optional parameter must be a variable") << std::endl;
+                        throw ast::InternalError(os.str(), 999, e.getLocation());
+                    }
 
-                SimpleVar* pVar = pL->getAs<SimpleVar>();
-                Exp* pR = &pAssign->getRightExp();
-                pR->accept(*this);
-                InternalType* pITR = getResult();
-                // IncreaseRef to protect opt argument of scope_end delete
-                // It will be deleted by clear_opt
-                pITR->IncreaseRef();
+                    SimpleVar* pVar = pL->getAs<SimpleVar>();
+                    Exp* pR = &pAssign->getRightExp();
+                    pR->accept(*this);
+                    InternalType* pITR = getResult();
+                    // IncreaseRef to protect opt argument of scope_end delete
+                    // It will be deleted by clear_opt
+                    pITR->IncreaseRef();
 
-                if (pIT->hasInvokeOption())
-                {
-                    opt.push_back(std::pair<std::wstring, InternalType*>(pVar->getSymbol().getName(), pITR));
-                    //in case of macro/macrofile, we have to shift input param
-                    //so add NULL item in in list to keep initial order
-                    if (pIT->isMacro() || pIT->isMacroFile())
+                    if (pIT->hasInvokeOption())
+                    {
+                        opt.push_back(std::pair<std::wstring, InternalType*>(pVar->getSymbol().getName(), pITR));
+                        //in case of macro/macrofile, we have to shift input param
+                        //so add NULL item in in list to keep initial order
+                        if (pIT->isMacro() || pIT->isMacroFile())
+                        {
+                            in.push_back(NULL);
+                        }
+                    }
+                    else
                     {
-                        in.push_back(NULL);
+                        in.push_back(pITR);
                     }
-                }
-                else
-                {
-                    in.push_back(pITR);
-                }
 
-                clearResult();
-                continue;
-            }
+                    clearResult();
+                    continue;
+                }
 
-            int iSize = getExpectedSize();
-            setExpectedSize(-1);
-            arg->accept(*this);
-            setExpectedSize(iSize);
+                int iSize = getExpectedSize();
+                setExpectedSize(-1);
+                arg->accept(*this);
+                setExpectedSize(iSize);
 
-            if (getResult() == NULL)
-            {
-                //special case for empty extraction of list ( list()(:) )
-                continue;
-            }
+                if (getResult() == NULL)
+                {
+                    //special case for empty extraction of list ( list()(:) )
+                    continue;
+                }
 
-            //extract implicit list for call()
-            if (pIT->isCallable() || pIT->isUserType())
-            {
-                InternalType * pITArg = getResult();
-                if (pITArg->isImplicitList())
+                //extract implicit list for call()
+                if (pIT->isCallable() || pIT->isUserType())
                 {
-                    types::ImplicitList* pIL = pITArg->getAs<types::ImplicitList>();
-                    if (pIL->isComputable())
+                    InternalType * pITArg = getResult();
+                    if (pITArg->isImplicitList())
                     {
-                        setResult(pIL->extractFullMatrix());
-                        pITArg->killMe();
+                        types::ImplicitList* pIL = pITArg->getAs<types::ImplicitList>();
+                        if (pIL->isComputable())
+                        {
+                            setResult(pIL->extractFullMatrix());
+                            pITArg->killMe();
+                        }
                     }
                 }
-            }
 
-            if (isSingleResult())
-            {
-                in.push_back(getResult());
-                getResult()->IncreaseRef();
-                clearResult();
-            }
-            else
-            {
-                for (int i = 0 ; i < getResultSize() ; i++)
+                if (isSingleResult())
                 {
-                    InternalType * pITArg = getResult(i);
-                    pITArg->IncreaseRef();
-                    in.push_back(pITArg);
+                    in.push_back(getResult());
+                    getResult()->IncreaseRef();
+                    clearResult();
                 }
+                else
+                {
+                    for (int i = 0 ; i < getResultSize() ; i++)
+                    {
+                        InternalType * pITArg = getResult(i);
+                        pITArg->IncreaseRef();
+                        in.push_back(pITArg);
+                    }
 
-                clearResult();
+                    clearResult();
+                }
             }
         }
+        catch (const InternalError& ie)
+        {
+            clearResult();
+            cleanOpt(opt);
+            cleanIn(in, out);
+            throw ie;
+        }
 
         try
         {

diff --git a/scilab/modules/core/sci_gateway/cpp/sci_getmd5.cpp b/scilab/modules/core/sci_gateway/cpp/sci_getmd5.cpp
index cc0b21d..329564e 100644 (file)
--- a/scilab/modules/core/sci_gateway/cpp/sci_getmd5.cpp
+++ b/scilab/modules/core/sci_gateway/cpp/sci_getmd5.cpp
@@ -31,6 +31,7 @@ using namespace types;
 Function::ReturnValue sci_getmd5(types::typed_list &in, int _iRetCount, types::typed_list &out)
 {
     bool bStringMode = false;
+    char* pstPath = NULL;
 
     if (_iRetCount != 1)
     {
@@ -79,7 +80,8 @@ Function::ReturnValue sci_getmd5(types::typed_list &in, int _iRetCount, types::t
 
         if (bStringMode)
         {
-            pstMD5 = to_wide_string(md5_str(wide_string_to_UTF8(wcsCurrentIn)));
+            pstPath = wide_string_to_UTF8(wcsCurrentIn);
+            pstMD5 = to_wide_string(md5_str(pstPath));
         }
         else
         {
@@ -88,42 +90,45 @@ Function::ReturnValue sci_getmd5(types::typed_list &in, int _iRetCount, types::t
 
             /* Replaces SCI, ~, HOME, TMPDIR by the real path */
             real_path = expandPathVariableW(wcsCurrentIn);
+            pstPath = wide_string_to_UTF8(real_path);
 
             /* bug 4469 */
             if (isdirW(real_path))
             {
-                char* pstPath = wide_string_to_UTF8(real_path);
                 Scierror(999, _("%s: The file %s does not exist.\n"), "getmd5", pstPath);
                 FREE(pstPath);
                 delete pOutput;
-                delete real_path;
+                FREE(real_path);
                 return Function::Error;
             }
 
-            wcfopen(fp, wide_string_to_UTF8(real_path), "rb");
+            wcfopen(fp, pstPath, "rb");
 
             if (fp)
             {
-                pstMD5 = to_wide_string(md5_file(fp));
+                char* pstrFile = md5_file(fp);
+                pstMD5 = to_wide_string(pstrFile);
                 fclose(fp);
+                FREE(pstrFile);
             }
             else
             {
-                char* pstPath = wide_string_to_UTF8(real_path);
                 Scierror(999, _("%s: The file %s does not exist.\n"), "getmd5", pstPath);
                 FREE(pstPath);
                 delete pOutput;
                 FREE(real_path);
                 return Function::Error;
             }
+
+            FREE(pstPath);
+            FREE(real_path);
         }
 
         pOutput->set(i, pstMD5);
-
+        FREE(pstMD5);
     }
 
     out.push_back(pOutput);
-
     return Function::OK;
 }
 /*--------------------------------------------------------------------------*/

diff --git a/scilab/modules/hdf5/sci_gateway/cpp/sci_h5rm.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_h5rm.cpp
index 6b84302..81128be 100644 (file)
--- a/scilab/modules/hdf5/sci_gateway/cpp/sci_h5rm.cpp
+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_h5rm.cpp
@@ -134,13 +134,22 @@ int sci_h5rm(char *fname, int* pvApiCtx)
     }
     catch (const std::exception & e)
     {
+        if (strs)
+        {
+            freeAllocatedMatrixOfString(row, col, strs);
+        }
+
         Scierror(999, _("%s: %s\n"), fname, e.what());
         return 0;
     }
 
+    if (strs)
+    {
+        freeAllocatedMatrixOfString(row, col, strs);
+    }
+
     AssignOutputVariable(pvApiCtx, 1) = 0;
     ReturnArguments(pvApiCtx);
-
     return 0;
 }
 

diff --git a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v1.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v1.cpp
index a14117f..41cf51f 100644 (file)
--- a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v1.cpp
+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v1.cpp
@@ -179,7 +179,7 @@ int sci_hdf5_load_v1(char *fn, int* pvApiCtx)
         createEmptyMatrix(pvApiCtx, nbIn + 1);
     }
 
-    for (auto& i : varList)
+    for (auto & i : varList)
     {
         FREE(i);
     }
@@ -567,6 +567,8 @@ static bool import_integer_v1(int* pvCtx, int _iDatasetId, int _iItemPos, int *_
             {
                 sciErr = createMatrixOfInteger8InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, iRows, iCols, pcData);
             }
+
+            FREE(pcData);
         }
         break;
         case SCI_UINT8:
@@ -588,6 +590,8 @@ static bool import_integer_v1(int* pvCtx, int _iDatasetId, int _iItemPos, int *_
             {
                 sciErr = createMatrixOfUnsignedInteger8InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, iRows, iCols, pucData);
             }
+
+            FREE(pucData);
         }
         break;
         case SCI_INT16:
@@ -609,6 +613,8 @@ static bool import_integer_v1(int* pvCtx, int _iDatasetId, int _iItemPos, int *_
             {
                 sciErr = createMatrixOfInteger16InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, iRows, iCols, psData);
             }
+
+            FREE(psData);
         }
         break;
         case SCI_UINT16:
@@ -630,6 +636,8 @@ static bool import_integer_v1(int* pvCtx, int _iDatasetId, int _iItemPos, int *_
             {
                 sciErr = createMatrixOfUnsignedInteger16InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, iRows, iCols, pusData);
             }
+
+            FREE(pusData);
         }
         break;
         case SCI_INT32:
@@ -651,6 +659,8 @@ static bool import_integer_v1(int* pvCtx, int _iDatasetId, int _iItemPos, int *_
             {
                 sciErr = createMatrixOfInteger32InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, iRows, iCols, piData);
             }
+
+            FREE(piData);
         }
         break;
         case SCI_UINT32:
@@ -672,6 +682,8 @@ static bool import_integer_v1(int* pvCtx, int _iDatasetId, int _iItemPos, int *_
             {
                 sciErr = createMatrixOfUnsignedInteger32InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, iRows, iCols, puiData);
             }
+
+            FREE(puiData);
         }
         break;
         case SCI_INT64:
@@ -694,6 +706,8 @@ static bool import_integer_v1(int* pvCtx, int _iDatasetId, int _iItemPos, int *_
             {
                 sciErr = createMatrixOfInteger64InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, iRows, iCols, pllData);
             }
+
+            FREE(pllData);
 #else
             return false;
 #endif
@@ -719,6 +733,8 @@ static bool import_integer_v1(int* pvCtx, int _iDatasetId, int _iItemPos, int *_
             {
                 sciErr = createMatrixOfUnsignedInteger64InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, iRows, iCols, pullData);
             }
+
+            FREE(pullData);
 #else
             return false;
 #endif
@@ -1252,12 +1268,19 @@ static bool import_hypermat_v1(int* pvCtx, int _iDatasetId, int _iVarType, int _
     iRet = readStringMatrix_v1(iItemDataset, iRows, iCols, pstData);
     if (iRet || strcmp(pstData[0], "hm") != 0)
     {
-        //freeStringMatrix_v1(iItemDataset, pstData);
+        FREE(piItemRef);
+        for (int i = 0; i < iRows * iCols; i++)
+        {
+            FREE(pstData[i]);
+        }
         delete[] pstData;
         return false;
     }
 
-    //freeStringMatrix_v1(iItemDataset, pstData);
+    for (int i = 0; i < iRows * iCols; i++)
+    {
+        FREE(pstData[i]);
+    }
     delete[] pstData;
     pstData = NULL;
 

diff --git a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v2.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v2.cpp
index e8900f6..4bdc211 100644 (file)
--- a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v2.cpp
+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v2.cpp
@@ -195,7 +195,7 @@ int sci_hdf5_load_v2(char *fn, int* pvApiCtx)
         createEmptyMatrix(pvApiCtx, nbIn + 1);
     }
 
-    for (auto& i : varList)
+    for (auto & i : varList)
     {
         FREE(i);
     }
@@ -369,7 +369,6 @@ static bool import_double(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piAd
         if (iDims > 2)
         {
             //hypermatrix
-            FREE(piDims);
             return false;
         }
 
@@ -403,15 +402,15 @@ static bool import_double(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piAd
 
     if (iDims == 0 || iSize == 0) //empty matrix
     {
+        if (piDims)
+        {
+            FREE(piDims);
+        }
+
         /*bug 7224 : to close dataset */
         iRet = readEmptyMatrix(_iDatasetId);
         if (iRet)
         {
-            if (piDims)
-            {
-                FREE(piDims);
-            }
-
             return false;
         }
 
@@ -564,6 +563,8 @@ static bool import_integer(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piA
             {
                 sciErr = createMatrixOfInteger8InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, piDims[0], piDims[1], pcData);
             }
+
+            FREE(pcData);
         }
         break;
         case SCI_UINT8:
@@ -586,6 +587,8 @@ static bool import_integer(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piA
             {
                 sciErr = createMatrixOfUnsignedInteger8InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, piDims[0], piDims[1], pucData);
             }
+
+            FREE(pucData);
         }
         break;
         case SCI_INT16:
@@ -608,6 +611,8 @@ static bool import_integer(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piA
             {
                 sciErr = createMatrixOfInteger16InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, piDims[0], piDims[1], psData);
             }
+
+            FREE(psData);
         }
         break;
         case SCI_UINT16:
@@ -630,6 +635,8 @@ static bool import_integer(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piA
             {
                 sciErr = createMatrixOfUnsignedInteger16InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, piDims[0], piDims[1], pusData);
             }
+
+            FREE(pusData);
         }
         break;
         case SCI_INT32:
@@ -652,6 +659,8 @@ static bool import_integer(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piA
             {
                 sciErr = createMatrixOfInteger32InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, piDims[0], piDims[1], piData);
             }
+
+            FREE(piData);
         }
         break;
         case SCI_UINT32:
@@ -674,6 +683,8 @@ static bool import_integer(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piA
             {
                 sciErr = createMatrixOfUnsignedInteger32InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, piDims[0], piDims[1], puiData);
             }
+
+            FREE(puiData);
         }
         break;
         case SCI_INT64:
@@ -697,6 +708,8 @@ static bool import_integer(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piA
             {
                 sciErr = createMatrixOfInteger64InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, piDims[0], piDims[1], pllData);
             }
+
+            FREE(pllData);
 #else
             FREE(piDims);
             return false;
@@ -724,6 +737,8 @@ static bool import_integer(int* pvCtx, int _iDatasetId, int _iItemPos, int *_piA
             {
                 sciErr = createMatrixOfUnsignedInteger64InNamedList(pvCtx, _pstVarname, _piAddress, _iItemPos, piDims[0], piDims[1], pullData);
             }
+
+            FREE(pullData);
 #else
             FREE(piDims);
             return false;
@@ -1176,6 +1191,7 @@ static bool import_hypermat(int* pvCtx, int _iDatasetId, int _iVarType, int _iIt
     iRet = getListItemReferences(_iDatasetId, &piItemRef);
     if (iRet)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1184,6 +1200,7 @@ static bool import_hypermat(int* pvCtx, int _iDatasetId, int _iVarType, int _iIt
     iRet = getListItemDataset(_iDatasetId, piItemRef, 0, &iItemDataset);
     if (iRet || iItemDataset == 0)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1191,6 +1208,7 @@ static bool import_hypermat(int* pvCtx, int _iDatasetId, int _iVarType, int _iIt
     int iItemType = getScilabTypeFromDataSet(iItemDataset);
     if (iItemType != sci_strings)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1198,6 +1216,7 @@ static bool import_hypermat(int* pvCtx, int _iDatasetId, int _iVarType, int _iIt
     iRet = getDatasetInfo(iItemDataset, &iComplex, &iDims, NULL);
     if (iRet < 0 || iDims != 2)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1205,6 +1224,7 @@ static bool import_hypermat(int* pvCtx, int _iDatasetId, int _iVarType, int _iIt
     int iSize = getDatasetInfo(iItemDataset, &iComplex, &iDims, piDims);
     if (iSize != 3)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         delete[] piDims;
         return false;
     }
@@ -1217,6 +1237,8 @@ static bool import_hypermat(int* pvCtx, int _iDatasetId, int _iVarType, int _iIt
     iRet = readStringMatrix(iItemDataset, pstData);
     if (iRet || strcmp(pstData[0], "hm") != 0)
     {
+        // if not the good type, do not h5close (deleteListItemReferences)
+        FREE(piItemRef);
         freeStringMatrix(iItemDataset, pstData);
         delete[] pstData;
         return false;
@@ -1230,12 +1252,14 @@ static bool import_hypermat(int* pvCtx, int _iDatasetId, int _iVarType, int _iIt
     iRet = getListItemDataset(_iDatasetId, piItemRef, 1, &iItemDataset);
     if (iRet)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
     iRet = getDatasetInfo(iItemDataset, &iComplex, &iDims, NULL);
     if (iRet < 0 || iDims != 2)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1243,6 +1267,7 @@ static bool import_hypermat(int* pvCtx, int _iDatasetId, int _iVarType, int _iIt
     iSize = getDatasetInfo(iItemDataset, &iComplex, &iDims, piDims);
     if (piDims[0] != 1)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         delete[] piDims;
         return false;
     }
@@ -1251,6 +1276,7 @@ static bool import_hypermat(int* pvCtx, int _iDatasetId, int _iVarType, int _iIt
     iRet = readInteger32Matrix(iItemDataset, piDimsArray);
     if (iRet)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         delete[] piDims;
         delete[] piDimsArray;
         return false;
@@ -1262,6 +1288,7 @@ static bool import_hypermat(int* pvCtx, int _iDatasetId, int _iVarType, int _iIt
     bool bRet = import_data(pvCtx, iItemDataset, _iItemPos, _piAddress, _pstVarname);
     if (bRet == false)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         delete[] piDims;
         delete[] piDimsArray;
         return false;
@@ -1329,6 +1356,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
     iRet = getListItemReferences(_iDatasetId, &piItemRef);
     if (iRet)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1337,6 +1365,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
     iRet = getListItemDataset(_iDatasetId, piItemRef, 0, &iItemDataset);
     if (iRet || iItemDataset == 0)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1344,6 +1373,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
     int iItemType = getScilabTypeFromDataSet(iItemDataset);
     if (iItemType != sci_strings)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1351,6 +1381,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
     iRet = getDatasetInfo(iItemDataset, &iComplex, &iDims, NULL);
     if (iRet < 0 || iDims != 2)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1358,6 +1389,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
     int iSize = getDatasetInfo(iItemDataset, &iComplex, &iDims, piDims);
     if (iSize != iItems)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         delete[] piDims;
         return false;
     }
@@ -1371,6 +1403,8 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
     iRet = readStringMatrix(iItemDataset, pstData);
     if (iRet || strcmp(pstData[0], "st") != 0)
     {
+        // if not the good type, do not h5close (deleteListItemReferences)
+        FREE(piItemRef);
         freeStringMatrix(iItemDataset, pstData);
         delete[] pstData;
         delete[] pstDataSave;
@@ -1391,6 +1425,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
     iRet = getListItemDataset(_iDatasetId, piItemRef, 1, &iItemDataset);
     if (iRet)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         for (int i = 0; i < (-2 + iItems); ++i)
         {
             delete pstDataSave[i];
@@ -1403,6 +1438,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
     iRet = getDatasetInfo(iItemDataset, &iComplex, &iDims, NULL);
     if (iRet < 0 || iDims != 2)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         for (int i = 0; i < (-2 + iItems); ++i)
         {
             delete pstDataSave[i];
@@ -1416,6 +1452,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
     iSize = getDatasetInfo(iItemDataset, &iComplex, &iDims, piDims);
     if (piDims[0] != 1)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         for (int i = 0; i < (-2 + iItems); ++i)
         {
             delete pstDataSave[i];
@@ -1430,6 +1467,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
     iRet = readInteger32Matrix(iItemDataset, piDimsArray);
     if (iRet)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         for (int i = 0; i < (-2 + iItems); ++i)
         {
             delete pstDataSave[i];
@@ -1471,6 +1509,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
             iRet = getListItemDataset(_iDatasetId, piItemRef, i + 2, &iItemDataset);
             if (iRet || iItemDataset == 0)
             {
+                deleteListItemReferences(_iDatasetId, piItemRef);
                 delete pList;
                 delete pStruct;
                 return false;
@@ -1482,6 +1521,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
             bool bRet = import_data(pvCtx, iItemDataset, 1, (int*)pList, pcName);
             if (bRet == false)
             {
+                deleteListItemReferences(_iDatasetId, piItemRef);
                 delete pList;
                 delete pStruct;
                 return false;
@@ -1500,6 +1540,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
             iRet = getListItemDataset(_iDatasetId, piItemRef, i + 2, &iItemDataset);
             if (iRet || iItemDataset == 0)
             {
+                deleteListItemReferences(_iDatasetId, piItemRef);
                 delete pList;
                 delete pStruct;
                 return false;
@@ -1511,6 +1552,7 @@ static bool import_struct(int* pvCtx, int _iDatasetId, int _iVarType, int _iItem
             bool bRet = import_data(pvCtx, iItemDataset, 1, (int*)pList, pcName);
             if (bRet == false)
             {
+                deleteListItemReferences(_iDatasetId, piItemRef);
                 delete pList;
                 delete pStruct;
                 return false;
@@ -1580,6 +1622,7 @@ static bool import_cell(int* pvCtx, int _iDatasetId, int _iVarType, int _iItemPo
     iRet = getListItemReferences(_iDatasetId, &piItemRef);
     if (iRet)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1588,6 +1631,7 @@ static bool import_cell(int* pvCtx, int _iDatasetId, int _iVarType, int _iItemPo
     iRet = getListItemDataset(_iDatasetId, piItemRef, 0, &iItemDataset);
     if (iRet || iItemDataset == 0)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1595,6 +1639,7 @@ static bool import_cell(int* pvCtx, int _iDatasetId, int _iVarType, int _iItemPo
     int iItemType = getScilabTypeFromDataSet(iItemDataset);
     if (iItemType != sci_strings)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1602,6 +1647,7 @@ static bool import_cell(int* pvCtx, int _iDatasetId, int _iVarType, int _iItemPo
     iRet = getDatasetInfo(iItemDataset, &iComplex, &iDims, NULL);
     if (iRet < 0 || iDims != 2)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1609,6 +1655,7 @@ static bool import_cell(int* pvCtx, int _iDatasetId, int _iVarType, int _iItemPo
     int iSize = getDatasetInfo(iItemDataset, &iComplex, &iDims, piDims);
     if (iSize != 3)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         delete[] piDims;
         return false;
     }
@@ -1621,6 +1668,8 @@ static bool import_cell(int* pvCtx, int _iDatasetId, int _iVarType, int _iItemPo
     iRet = readStringMatrix(iItemDataset, pstData);
     if (iRet || strcmp(pstData[0], "ce") != 0)
     {
+        // if not the good type, do not h5close (deleteListItemReferences)
+        FREE(piItemRef);
         freeStringMatrix(iItemDataset, pstData);
         delete[] pstData;
         return false;
@@ -1634,12 +1683,14 @@ static bool import_cell(int* pvCtx, int _iDatasetId, int _iVarType, int _iItemPo
     iRet = getListItemDataset(_iDatasetId, piItemRef, 1, &iItemDataset);
     if (iRet)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
     iRet = getDatasetInfo(iItemDataset, &iComplex, &iDims, NULL);
     if (iRet < 0 || iDims != 2)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         return false;
     }
 
@@ -1647,6 +1698,7 @@ static bool import_cell(int* pvCtx, int _iDatasetId, int _iVarType, int _iItemPo
     iSize = getDatasetInfo(iItemDataset, &iComplex, &iDims, piDims);
     if (piDims[0] != 1)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         delete[] piDims;
         return false;
     }
@@ -1655,6 +1707,7 @@ static bool import_cell(int* pvCtx, int _iDatasetId, int _iVarType, int _iItemPo
     iRet = readInteger32Matrix(iItemDataset, piDimsArray);
     if (iRet)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         delete[] piDims;
         delete[] piDimsArray;
         return false;
@@ -1667,6 +1720,7 @@ static bool import_cell(int* pvCtx, int _iDatasetId, int _iVarType, int _iItemPo
     iRet = getListItemDataset(_iDatasetId, piItemRef, 2, &iItemDataset);
     if (iRet || iItemDataset == 0)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         delete pList;
         delete pCell;
         return false;
@@ -1675,6 +1729,7 @@ static bool import_cell(int* pvCtx, int _iDatasetId, int _iVarType, int _iItemPo
     bool bRet = import_data(pvCtx, iItemDataset, 1, (int*)pList, NULL);
     if (bRet == false)
     {
+        deleteListItemReferences(_iDatasetId, piItemRef);
         delete pList;
         delete pCell;
         return false;

diff --git a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp
index 0bd0da7..6d8a932 100644 (file)
--- a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp
+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_load_v3.cpp
@@ -136,7 +136,7 @@ types::Function::ReturnValue sci_hdf5_load_v3(types::typed_list &in, int _iRetCo
         {
             std::vector<char*> vars(iNbItem);
             iNbItem = getVariableNames6(iFile, vars.data());
-            for (auto &var : vars)
+            for (auto & var : vars)
             {
                 std::string s(var);
                 FREE(var);
@@ -522,6 +522,10 @@ static types::InternalType* import_list(int dataset, types::List* lst)
         }
 
         lst->append(child);
+        if (child->isList())
+        {
+            child->killMe();
+        }
     }
 
     closeList6(dataset);
@@ -569,6 +573,7 @@ static types::InternalType* import_struct(int dataset)
     {
         //empty struct
         closeList6(dataset);
+        delete str;
         return new types::Struct();
     }
 
@@ -596,7 +601,7 @@ static types::InternalType* import_struct(int dataset)
     //open __refs__ node
     int refs = getDataSetIdFromName(dataset, "__refs__");
 
-    for (const auto& name : fields)
+    for (const auto & name : fields)
     {
         wchar_t* field = to_wide_string(name);
         str->addField(field);
@@ -606,6 +611,7 @@ static types::InternalType* import_struct(int dataset)
         {
             closeList6(dataset);
             freeStringMatrix(dfield, fields.data());
+            delete str;
             return nullptr;
         }
 
@@ -618,6 +624,7 @@ static types::InternalType* import_struct(int dataset)
         if (ret < 0)
         {
             freeStringMatrix(dfield, fields.data());
+            delete str;
             return nullptr;
         }
 
@@ -629,6 +636,7 @@ static types::InternalType* import_struct(int dataset)
             if (data < 0)
             {
                 freeStringMatrix(dfield, fields.data());
+                delete str;
                 return nullptr;
             }
 
@@ -636,6 +644,7 @@ static types::InternalType* import_struct(int dataset)
             if (val == nullptr)
             {
                 freeStringMatrix(dfield, fields.data());
+                delete str;
                 return nullptr;
             }
 
@@ -936,7 +945,7 @@ static types::InternalType* import_handles(int dataset)
     if (Links::count())
     {
         std::list<int> legends = Links::legends();
-        for (auto& i : legends)
+        for (auto & i : legends)
         {
             Links::PathList paths = Links::get(i);
             update_link_path(i, paths);
@@ -968,7 +977,7 @@ static types::InternalType* import_macro(int dataset)
     {
         readStringMatrix(inputNode, inputNames.data());
 
-        for (auto& input : inputNames)
+        for (auto & input : inputNames)
         {
             wchar_t* winput = to_wide_string(input);
             symbol::Variable* var = ctx->getOrCreate(symbol::Symbol(winput));
@@ -992,7 +1001,7 @@ static types::InternalType* import_macro(int dataset)
     {
         readStringMatrix(outputNode, outputNames.data());
 
-        for (auto& output : outputNames)
+        for (auto & output : outputNames)
         {
             wchar_t* woutput = to_wide_string(output);
             symbol::Variable* var = ctx->getOrCreate(symbol::Symbol(woutput));
@@ -1082,7 +1091,7 @@ static types::InternalType* import_usertype(int dataset)
 
     if (out.size() != 1)
     {
-        for (auto& i : out)
+        for (auto & i : out)
         {
             i->killMe();
         }

diff --git a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_save.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_save.cpp
index 36eac65..d55b77f 100644 (file)
--- a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_save.cpp
+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_save.cpp
@@ -497,7 +497,6 @@ static int export_struct(int parent, const std::string& name, types::Struct* dat
     //save fields list in vector to keep order
     export_string(dset, "__fields__", fields);
 
-
     std::vector<hobj_ref_t> vrefs(size);
     //fill main group with struct field name
     for (int i = 0; i < fieldCount; ++i)
@@ -516,6 +515,7 @@ static int export_struct(int parent, const std::string& name, types::Struct* dat
             ret = addItemStruct6(refs, vrefs.data(), j, refname.data());
             if (ret)
             {
+                delete fields;
                 return -1;
             }
         }
@@ -524,10 +524,13 @@ static int export_struct(int parent, const std::string& name, types::Struct* dat
         FREE(cfield);
         if (ret < 0)
         {
+            delete fields;
             return -1;
         }
     }
 
+    delete fields;
+
     if (closeList6(refs) == -1)
     {
         return -1;

diff --git a/scilab/modules/hdf5/src/c/h5_writeDataToFile.c b/scilab/modules/hdf5/src/c/h5_writeDataToFile.c
index fe162b1..cb60f3d 100644 (file)
--- a/scilab/modules/hdf5/src/c/h5_writeDataToFile.c
+++ b/scilab/modules/hdf5/src/c/h5_writeDataToFile.c
@@ -201,6 +201,8 @@ int updateScilabVersion(int _iFile)
     char* pstScilabVersion = getScilabVersionAttribute(_iFile);
     if (pstScilabVersion)
     {
+        FREE(pstScilabVersion);
+
         //delete before write
         status = H5Adelete(_iFile, g_SCILAB_CLASS_SCI_VERSION);
         if (status < 0)
@@ -2009,7 +2011,7 @@ static int deleteHDF5group(int _iFile, const char* _pstName)
             }
             ////unlink child
             //status = H5Ldelete(groupID, pstChildName, H5P_DEFAULT);
-            //FREE(pstChildName);
+            FREE(pstChildName);
 
             //if (status < 0)
             //{

diff --git a/scilab/modules/hdf5/tests/nonreg_tests/bug_9510.dia.ref b/scilab/modules/hdf5/tests/nonreg_tests/bug_9510.dia.ref
index ee1890b..bdb4b8c 100644 (file)
--- a/scilab/modules/hdf5/tests/nonreg_tests/bug_9510.dia.ref
+++ b/scilab/modules/hdf5/tests/nonreg_tests/bug_9510.dia.ref
@@ -14,12 +14,13 @@
 // export does not return %f when try to export unmanaged data types.
 //
 A = sparse( [ 2  3  0  0  0;
-              3  0  4  0  6;
-              0 -1 -3  2  0;
-              0  0  1  0  0;
-              0  4  2  0  1] );
+3  0  4  0  6;
+0 -1 -3  2  0;
+0  0  1  0  0;
+0  4  2  0  1] );
 b = [8 ; 45; -3; 3; 19];
 lusparse = umf_lufact(A);
 err = execstr("save(TMPDIR + ""/lusparse.sod"",""lusparse"")", "errcatch");
 assert_checktrue(err <> 0);
 if ls(TMPDIR+"/lusparse.sod") <> [] then pause end
+umf_ludel(lusparse);

diff --git a/scilab/modules/hdf5/tests/nonreg_tests/bug_9510.tst b/scilab/modules/hdf5/tests/nonreg_tests/bug_9510.tst
index a61bb0c..724f95b 100644 (file)
--- a/scilab/modules/hdf5/tests/nonreg_tests/bug_9510.tst
+++ b/scilab/modules/hdf5/tests/nonreg_tests/bug_9510.tst
@@ -25,3 +25,4 @@ lusparse = umf_lufact(A);
 err = execstr("save(TMPDIR + ""/lusparse.sod"",""lusparse"")", "errcatch");
 assert_checktrue(err <> 0);
 if ls(TMPDIR+"/lusparse.sod") <> [] then pause end
+umf_ludel(lusparse);

diff --git a/scilab/modules/hdf5/tests/unit_tests/h5open.dia.ref b/scilab/modules/hdf5/tests/unit_tests/h5open.dia.ref
index bbe32ec..7fd1d06 100644 (file)
--- a/scilab/modules/hdf5/tests/unit_tests/h5open.dia.ref
+++ b/scilab/modules/hdf5/tests/unit_tests/h5open.dia.ref
@@ -11,24 +11,27 @@ assert_checkerror("h5open()",msgerr,77);
 msgerr = msprintf(gettext("%s: Wrong type for input argument #%d: A string expected.\n"), "h5open", 1);
 assert_checkerror("h5open(42)",msgerr,999);
 a = h5open(TMPDIR + "/x.sod");
-assert_checkequal(a.root.Name,'/')
+assert_checkequal(a.root.Name,"/")
  ans  =
- 
-  T  
+  T
 h5close(a);
 x = 1:10;
 save(TMPDIR + "/x.sod", "x");
 b = h5open(TMPDIR + "/x.sod");
-assert_checkequal(b.root.Datasets,'x');
+assert_checkequal(b.root.Datasets,"x");
 h5close(b);
 a = h5open(TMPDIR + "/y.tst");
-assert_checkequal(a.root.Name,'/');
+assert_checkequal(a.root.Name,"/");
 h5write(a,"Dset_1",[1 2;3 4]);
 h5close(a);
-msgerr = msprintf(gettext("%s: %s\n"), "h5open", msprintf(gettext("Cannot append the file (not HDF5): %s."), pathconvert(SCI, %f) + filesep() + "COPYING-FR"));
-msgerr($+1) = gettext("HDF5 description") + ": " + "unable to find a valid file signature.";
-assert_checkerror("h5open(SCI + ""/COPYING-FR"")",msgerr,999);
+try
+    h5open(SCI + "/COPYING-FR");
+    error("h5open should produce an error");
+catch
+end
 copyfile(SCI+"/COPYING-FR",TMPDIR+"/z.h5");
-msgerr = msprintf(gettext("%s: %s\n"), "h5open", msprintf(gettext("Cannot append the file (not HDF5): %s."), TMPDIR + filesep() + "z.h5"));
-msgerr($+1) = gettext("HDF5 description") + ": " + "unable to find a valid file signature.";
-assert_checkerror("h5open(TMPDIR + ""/z.h5"")",msgerr,999);
+try
+    h5open(TMPDIR+"/z.h5");
+    error("h5open should produce an error");
+catch
+end

diff --git a/scilab/modules/hdf5/tests/unit_tests/h5open.tst b/scilab/modules/hdf5/tests/unit_tests/h5open.tst
index cb12af9..9db125f 100644 (file)
--- a/scilab/modules/hdf5/tests/unit_tests/h5open.tst
+++ b/scilab/modules/hdf5/tests/unit_tests/h5open.tst
@@ -13,23 +13,28 @@ msgerr = msprintf(gettext("%s: Wrong type for input argument #%d: A string expec
 assert_checkerror("h5open(42)",msgerr,999);
 
 a = h5open(TMPDIR + "/x.sod");
-assert_checkequal(a.root.Name,'/')
+assert_checkequal(a.root.Name,"/")
 h5close(a);
 x = 1:10;
 save(TMPDIR + "/x.sod", "x");
 b = h5open(TMPDIR + "/x.sod");
-assert_checkequal(b.root.Datasets,'x');
+assert_checkequal(b.root.Datasets,"x");
 h5close(b);
 a = h5open(TMPDIR + "/y.tst");
-assert_checkequal(a.root.Name,'/');
+assert_checkequal(a.root.Name,"/");
 h5write(a,"Dset_1",[1 2;3 4]);
 h5close(a);
 
-msgerr = msprintf(gettext("%s: %s\n"), "h5open", msprintf(gettext("Cannot append the file (not HDF5): %s."), pathconvert(SCI, %f) + filesep() + "COPYING-FR"));
-msgerr($+1) = gettext("HDF5 description") + ": " + "unable to find a valid file signature.";
-assert_checkerror("h5open(SCI + ""/COPYING-FR"")",msgerr,999);
+try
+    h5open(SCI + "/COPYING-FR");
+    error("h5open should produce an error");
+catch
+end
 
 copyfile(SCI+"/COPYING-FR",TMPDIR+"/z.h5");
-msgerr = msprintf(gettext("%s: %s\n"), "h5open", msprintf(gettext("Cannot append the file (not HDF5): %s."), TMPDIR + filesep() + "z.h5"));
-msgerr($+1) = gettext("HDF5 description") + ": " + "unable to find a valid file signature.";
-assert_checkerror("h5open(TMPDIR + ""/z.h5"")",msgerr,999);
+try
+    h5open(TMPDIR+"/z.h5");
+    error("h5open should produce an error");
+catch
+end
+

diff --git a/scilab/modules/types/sci_gateway/cpp/sci_cell.cpp b/scilab/modules/types/sci_gateway/cpp/sci_cell.cpp
index 227b428..65648bf 100644 (file)
--- a/scilab/modules/types/sci_gateway/cpp/sci_cell.cpp
+++ b/scilab/modules/types/sci_gateway/cpp/sci_cell.cpp
@@ -81,7 +81,7 @@ types::Function::ReturnValue sci_cell(types::typed_list &in, int _iRetCount, typ
             piDimsArray[i] = (int)in[i]->getAs<types::Double>()->get(0);
         }
         pRetVal = new types::Cell(in.size(), piDimsArray);
-        delete piDimsArray;
+        delete[] piDimsArray;
     }
 
     if (pRetVal == NULL)

diff --git a/scilab/modules/umfpack/sci_gateway/c/sci_umf_lufact.c b/scilab/modules/umfpack/sci_gateway/c/sci_umf_lufact.c
index 289e7e4..e55f603 100644 (file)
--- a/scilab/modules/umfpack/sci_gateway/c/sci_umf_lufact.c
+++ b/scilab/modules/umfpack/sci_gateway/c/sci_umf_lufact.c
@@ -129,6 +129,13 @@ int sci_umf_lufact(char* fname, void* pvApiCtx)
 
     if (sciErr.iErr)
     {
+        FREE(piNbItemRow);
+        FREE(piColPos);
+        FREE(pdblSpReal);
+        if (pdblSpImg)
+        {
+            FREE(pdblSpImg);
+        }
         printError(&sciErr, 0);
         return 1;
     }
@@ -145,12 +152,27 @@ int sci_umf_lufact(char* fname, void* pvApiCtx)
 
     if (nA <= 0 || mA <= 0)
     {
+        FREE(piNbItemRow);
+        FREE(piColPos);
+        FREE(pdblSpReal);
+        if (pdblSpImg)
+        {
+            FREE(pdblSpImg);
+        }
         Scierror(999, _("%s: Wrong size for input argument #%d.\n"), fname, 1);
         return 1;
     }
 
     SciSparseToCcsSparse(&AA, &A);
 
+    FREE(piNbItemRow);
+    FREE(piColPos);
+    FREE(pdblSpReal);
+    if (pdblSpImg)
+    {
+        FREE(pdblSpImg);
+    }
+
     /* symbolic factorization */
     if (A.it == 1)
     {

diff --git a/scilab/tools/profiling/valgrind.supp b/scilab/tools/profiling/valgrind.supp
index d0160ad..6c97857 100644 (file)
--- a/scilab/tools/profiling/valgrind.supp
+++ b/scilab/tools/profiling/valgrind.supp
@@ -38,4 +38,11 @@
    fun:_dl_allocate_tls
    ...
 }
+{
+   hdf5/H5_build_extpath
+   Memcheck:Addr4
+   fun:H5_build_extpath
+   fun:H5F_open
+   ...
+}