Check if malloc / calloc returned NULL (#918)

- Also display which Jenkins node is running tests for a PR
OpenModelica · Jan 28, 2021 · 126bb78 · 126bb78
1 parent 94de8fc
commit 126bb78
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -699,7 +699,7 @@ def numPhysicalCPU() {
 }
 
 void partest(cache=true, extraArgs='') {
-  echo "cache: ${cache}, asan: ${env.ASAN}"
+  echo "cache: ${cache}, asan: ${env.ASAN}, running on node: ${env.NODE_NAME}"
   sh """
   make -C testsuite difftool resources
   cp -f "${env.RUNTESTDB}/"* testsuite/ || true
@@ -710,10 +710,9 @@ void partest(cache=true, extraArgs='') {
 
   sh ("""#!/bin/bash -x
   ulimit -t 1500
-  ${env.ASAN ? "" : "ulimit -v 6291456" /* Max 6GB per process */}
 
   cd testsuite/partest
-  ./runtests.pl ${env.ASAN ? "-asan": ""} -j${numPhysicalCPU()} -nocolour ${env.BRANCH_NAME == "master" ? "-notlm" : ""} -with-xml ${params.RUNTESTS_FLAG} ${extraArgs}
+  ./runtests.pl ${env.ASAN ? "-asan": ""} ${env.ASAN ? "-j1": "-j${numPhysicalCPU()}"} -nocolour ${env.BRANCH_NAME == "master" ? "-notlm" : ""} -with-xml ${params.RUNTESTS_FLAG} ${extraArgs}
   CODE=\$?
   test \$CODE = 0 -o \$CODE = 7 || exit 1
   """
@@ -752,7 +751,7 @@ void buildOMS() {
      %OMDEV%\\tools\\msys\\usr\\bin\\sh --login -c "cd `cygpath '${WORKSPACE}'` && chmod +x buildOMSimulatorWindows.sh && ./buildOMSimulatorWindows.sh && rm -f ./buildOMSimulatorWindows.sh"
     """)
   } else {
-    echo "${env.NODE_NAME}"
+    echo "running on node: ${env.NODE_NAME}"
     def nproc = numPhysicalCPU()
     sh """
     ${env.SHELLSTART ?: ""}

diff --git a/src/OMSimulatorLib/MatVer4.cpp b/src/OMSimulatorLib/MatVer4.cpp
@@ -119,6 +119,8 @@ oms::MatVer4Matrix* oms::readMatVer4Matrix(FILE* file)
   MatVer4Type_t type = (MatVer4Type_t) (matrix->header.type % 100);
   size_t size = sizeofMatVer4Type(type);
   matrix->data = malloc(matrix->header.mrows * matrix->header.ncols * size);
+  if (!matrix->data)
+    return NULL;
   fread(matrix->data, size, matrix->header.mrows*matrix->header.ncols, file);
 
   return matrix;

diff --git a/src/OMSimulatorLib/Model.cpp b/src/OMSimulatorLib/Model.cpp
@@ -331,6 +331,11 @@ oms_status_enu_t oms::Model::list(const oms::ComRef& cref, char** contents)
 
   doc.save(writer);
   *contents = (char*) malloc(strlen(writer.result.c_str()) + 1);
+  if (!*contents)
+  {
+    logError("Out of memory");
+    return oms_status_fatal;
+  }
   strcpy(*contents, writer.result.c_str());
   return oms_status_ok;
 }
@@ -396,6 +401,11 @@ oms_status_enu_t oms::Model::exportSnapshot(const oms::ComRef& cref, char** cont
 
   doc.save(writer);
   *contents = (char*) malloc(strlen(writer.result.c_str()) + 1);
+  if (!*contents)
+  {
+    logError("Out of memory");
+    return oms_status_fatal;
+  }
   strcpy(*contents, writer.result.c_str());
 
   return oms_status_ok;

diff --git a/src/OMSimulatorLib/OMSFileSystem.cpp b/src/OMSimulatorLib/OMSFileSystem.cpp
@@ -54,6 +54,11 @@ filesystem::path oms_temp_directory_path(void)
 {
 #if (_WIN32)
   char* val = (char*)malloc(sizeof(char)*(MAX_PATH + 1));
+  if (!val)
+  {
+    logError("Out of memory");
+    return NULL;
+  }
   GetTempPath(MAX_PATH, val);
 
   filesystem::path p((val!=0) ? val : "/tmp");

diff --git a/src/OMSimulatorLib/System.cpp b/src/OMSimulatorLib/System.cpp
@@ -382,6 +382,11 @@ oms_status_enu_t oms::System::listUnconnectedConnectors(char** contents) const
   if (!msg.empty())
   {
     *contents = (char*) malloc(msg.length() + 1);
+    if (!*contents)
+    {
+      logError("Out of memory");
+      return oms_status_fatal;
+    }
     strcpy(*contents, msg.c_str());
   }
   return oms_status_ok;