Merge pull request open-mpi#9995 from hppritcha/topic/sessons_coverity_cleanups0

sessions: some coverity cleanups

Author: hppritcha

ompi/communicator/comm.c

@@ -1510,13 +1510,15 @@ int ompi_intercomm_create_from_groups (ompi_group_t *local_group, int local_lead
             asprintf (&sub_tag, "%s-OMPIi-LC", tag);
             if (OPAL_UNLIKELY(NULL == sub_tag)) {
                 ompi_comm_free (&local_comm);
+                free(leader_procs);
                 return OMPI_ERR_OUT_OF_RESOURCE;
             }
 
             leader_group = ompi_group_allocate_plist_w_procs (leader_procs, 2);
             ompi_set_group_rank (leader_group, my_proc);
             if (OPAL_UNLIKELY(NULL == leader_group)) {
                 free (sub_tag);
+                free(leader_procs);
                 ompi_comm_free (&local_comm);
                 return OMPI_ERR_OUT_OF_RESOURCE;
             }
@@ -1528,6 +1530,7 @@ int ompi_intercomm_create_from_groups (ompi_group_t *local_group, int local_lead
             OBJ_RELEASE(leader_group);
             free (sub_tag);
             if (OPAL_UNLIKELY(OMPI_SUCCESS != rc)) {
+                free(leader_procs);
                 ompi_comm_free (&local_comm);
                 return rc;
             }

ompi/errhandler/errhandler.c

@@ -300,7 +300,9 @@ ompi_errhandler_t *ompi_errhandler_create(ompi_errhandler_type_t object_type,
             }
         }
 
-        new_errhandler->eh_fort_fn = (ompi_errhandler_fortran_handler_fn_t *)func;
+        if (NULL != new_errhandler) {
+            new_errhandler->eh_fort_fn = (ompi_errhandler_fortran_handler_fn_t *)func;
+        }
 
     }
 

ompi/instance/instance.c

@@ -275,6 +275,7 @@ int ompi_mpi_instance_retain (void)
 
     /* initialize info */
     if (OMPI_SUCCESS != (ret = ompi_mpiinfo_init ())) {
+        opal_mutex_unlock (&instance_lock);
         return ompi_instance_print_error ("ompi_info_init() failed", ret);
     }
 
@@ -919,9 +920,6 @@ int ompi_mpi_instance_finalize (ompi_instance_t **instance)
     opal_mutex_lock (&instance_lock);
     if (0 == opal_atomic_add_fetch_32 (&ompi_instance_count, -1)) {
         ret = ompi_mpi_instance_finalize_common ();
-        if (OPAL_UNLIKELY(OPAL_SUCCESS != ret)) {
-            opal_mutex_unlock (&instance_lock);
-        }
     }
     opal_mutex_unlock (&instance_lock);
 

ompi/mpi/c/group_from_session_pset.c

@@ -32,11 +32,16 @@ int MPI_Group_from_session_pset (MPI_Session session, const char *pset_name, MPI
 
     if ( MPI_PARAM_CHECK ) {
         if (NULL == session || NULL == pset_name || NULL == newgroup) {
-            return OMPI_ERRHANDLER_INVOKE(session, MPI_ERR_ARG, FUNC_NAME);
+            if (NULL != session) {
+                return OMPI_ERRHANDLER_INVOKE(session, MPI_ERR_ARG, FUNC_NAME);
+            } else {
+                return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ARG, FUNC_NAME);
+            }
         }
     }
 
     rc = ompi_group_from_pset (session, pset_name, newgroup);
-    /* if an error occured raise it on the null session */
-    OMPI_ERRHANDLER_RETURN (rc, session, rc, FUNC_NAME);
+
+    OMPI_ERRHANDLER_RETURN (rc, (NULL == session) ? MPI_SESSION_NULL : session,
+                            rc, FUNC_NAME);
 }

ompi/mpi/c/intercomm_merge.c

@@ -97,7 +97,8 @@ int MPI_Intercomm_merge(MPI_Comm intercomm, int high,
 
     first = ompi_comm_determine_first ( intercomm, thigh );
     if ( MPI_UNDEFINED == first ) {
-        return OMPI_ERRHANDLER_INVOKE(intercomm, MPI_ERR_INTERN, FUNC_NAME);
+        rc = MPI_ERR_INTERN;
+        goto exit;
     }
 
     if ( first ) {

ompi/mpi/c/session_get_nth_pset.c

@@ -32,12 +32,16 @@ int MPI_Session_get_nth_pset (MPI_Session session, MPI_Info info, int n, int *le
 
     if ( MPI_PARAM_CHECK ) {
         if (NULL == session || (NULL == pset_name && *len > 0) || n < 0) {
-            return OMPI_ERRHANDLER_INVOKE(session, MPI_ERR_ARG, FUNC_NAME);
+            if (NULL != session) {
+                return OMPI_ERRHANDLER_INVOKE(session, MPI_ERR_ARG, FUNC_NAME);
+            } else {
+                return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ARG, FUNC_NAME);
+            }
         }
     }
 
     rc = ompi_instance_get_nth_pset (session, n, len, pset_name);
 
-    /* if an error occured raise it on the null session */
-    OMPI_ERRHANDLER_RETURN (rc, MPI_SESSION_NULL, rc, FUNC_NAME);
+    OMPI_ERRHANDLER_RETURN (rc, (NULL == session) ? MPI_SESSION_NULL : session, 
+                            rc, FUNC_NAME);
 }

ompi/mpi/c/session_get_num_psets.c

@@ -32,11 +32,16 @@ int MPI_Session_get_num_psets (MPI_Session session, MPI_Info info, int *npset_na
 
     if ( MPI_PARAM_CHECK ) {
         if (NULL == session || NULL == npset_names) {
-            return OMPI_ERRHANDLER_INVOKE(session, MPI_ERR_ARG, FUNC_NAME);
+            if (NULL != session) {
+                return OMPI_ERRHANDLER_INVOKE(session, MPI_ERR_ARG, FUNC_NAME);
+            } else {
+                return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ARG, FUNC_NAME);
+            }
         }
     }
 
     rc = ompi_instance_get_num_psets (session, npset_names);
-    /* if an error occured raise it on the null session */
-    OMPI_ERRHANDLER_RETURN (rc, MPI_SESSION_NULL, rc, FUNC_NAME);
+
+    OMPI_ERRHANDLER_RETURN (rc, (NULL == session) ? MPI_SESSION_NULL : session,
+                            rc, FUNC_NAME);
 }

ompi/mpi/fortran/mpif-h/session_get_pset_info_f.c

@@ -78,7 +78,7 @@ void ompi_session_get_pset_info_f(MPI_Fint *session,char *pset_name, MPI_Fint *i
 {
     int c_ierr, ret;
     MPI_Session c_session;
-    char *c_name;
+    char *c_name = NULL;
     MPI_Info c_info;
 
     c_session = PMPI_Session_f2c(*session);
@@ -96,6 +96,10 @@ void ompi_session_get_pset_info_f(MPI_Fint *session,char *pset_name, MPI_Fint *i
     c_ierr = PMPI_Session_get_pset_info(c_session, c_name, &c_info);
     if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr);
 
+    if (NULL != c_name) {
+        free (c_name);
+    }
+
     if (MPI_SUCCESS == c_ierr) {
         *info = PMPI_Info_c2f(c_info);
     }