Address coverity issues

sandialabs · Aug 27, 2024 · 521dc51 · 521dc51
1 parent a28082d
commit 521dc51
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/packages/seacas/applications/cpup/cpup.C b/packages/seacas/applications/cpup/cpup.C
@@ -374,7 +374,7 @@ template <typename INT> void cpup(Cpup::SystemInterface &interFace, INT /*dummy*
             }
 
             // Now transfer the fields on the embedded node block...
-            auto pnb = pblock->get_node_block();
+            const auto &pnb = pblock->get_node_block();
             fields.clear();
             pnb.field_describe(Ioss::Field::TRANSIENT, &fields);
             for (const auto &field_name : fields) {

diff --git a/packages/seacas/libraries/aprepro_lib/apr_aprepro.cc b/packages/seacas/libraries/aprepro_lib/apr_aprepro.cc
@@ -137,7 +137,7 @@ namespace SEAMS {
 
   std::string Aprepro::long_version() const
   {
-    auto comment = getsym("_C_")->value.svar;
+    const auto &comment = getsym("_C_")->value.svar;
     return comment + " Algebraic Preprocessor (Aprepro) version " + version();
   }
 

diff --git a/packages/seacas/libraries/exodus/src/ex_put_assemblies.c b/packages/seacas/libraries/exodus/src/ex_put_assemblies.c
@@ -176,7 +176,9 @@ int ex_put_assemblies(int exoid, size_t count, const struct ex_assembly *assembl
   }
 
   /* Update the maximum_name_length attribute on the file. */
-  exi_update_max_name_length(exoid, max_name_len - 1);
+  if (max_name_len > 0) {
+    exi_update_max_name_length(exoid, max_name_len - 1);
+  }
 
   /* Assembly are now all defined; see if any set data needs to be output... */
   for (size_t i = 0; i < count; i++) {

diff --git a/packages/seacas/libraries/exodus/src/ex_put_init_ext.c b/packages/seacas/libraries/exodus/src/ex_put_init_ext.c
@@ -293,10 +293,18 @@ int ex_put_init_ext(int exoid, const ex_init_params *model)
     ex_err_fn(exoid, __func__, errmsg, status);
     goto error_ret;
   }
+
   {
     struct exi_file_item *file = exi_find_file_item(exoid);
-    file->time_varid           = temp;
+    if (!file) {
+      char errmsg[MAX_ERR_LENGTH];
+      snprintf(errmsg, MAX_ERR_LENGTH, "ERROR: unknown file id %d.", exoid);
+      ex_err_fn(exoid, __func__, errmsg, EX_BADFILEID);
+      goto error_ret;
+    }
+    file->time_varid = temp;
   }
+
   exi_compress_variable(exoid, temp, -2); /* Don't compress, but do set collective io */
 
   if (model->num_dim > 0) {

diff --git a/packages/seacas/libraries/ioss/src/Ioss_Region.C b/packages/seacas/libraries/ioss/src/Ioss_Region.C
@@ -383,13 +383,13 @@ namespace Ioss {
 
       // Region owns the database pointer even though other entities use it.
       GroupingEntity::really_delete_database();
+
+      if (topologyObserver) {
+        topologyObserver->register_region(nullptr);
+      }
     }
     catch (...) {
     }
-
-    if (topologyObserver) {
-      topologyObserver->register_region(nullptr);
-    }
   }
 
   void Region::reset_region()

diff --git a/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C b/packages/seacas/libraries/ioss/src/init/Ionit_Initializer.C
@@ -49,8 +49,6 @@
 
 #include "Ioss_IOFactory.h"
 
-#include "Ioss_DynamicTopology.h"
-
 namespace {
 #if defined(IOSS_THREADSAFE)
   std::mutex m_;
@@ -100,7 +98,6 @@ namespace Ioss::Init {
     Iogs::IOFactory::factory(); // Structured Mesh Generator
     Ionull::IOFactory::factory();
     Ioss::StorageInitializer();
-    Ioss::DynamicTopologyBroker::broker();
     Ioss::Initializer();
     Iotr::Initializer();
 #ifdef HAVE_SEACASIOSS_ADIOS2