Skip to content

coverity: address CIDs 1645542 and 1645543 #13186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 9, 2025
+12 −6
Merged

coverity: address CIDs 1645542 and 1645543 #13186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ompi/mpi/c/type_create_darray.c.in
View file
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ PROTOTYPE ERROR_CLASS type_create_darray(INT size,
return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ARG, FUNC_NAME);
} else if( (MPI_DISTRIBUTE_DFLT_DARG != darg_array[i]) &&
(MPI_DISTRIBUTE_BLOCK == distrib_array[i]) &&
((darg_array[i] * psize_array[i]) < gsize_array[i]) ) {
((MPI_Count)(darg_array[i] * psize_array[i]) < (MPI_Count)gsize_array[i]) ) {
return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ARG, FUNC_NAME);
} else if( 1 > psize_array[i] )
return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_ARG, FUNC_NAME);
16 changes: 11 additions & 5 deletions ompi/mpi/c/type_create_struct.c.in
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ PROTOTYPE ERROR_CLASS type_create_struct(COUNT count,
DATATYPE_ARRAY array_of_types,
DATATYPE_OUT newtype)
{
int i, rc;
int i, rc, icount = (int)count;
int *iarray_of_blocklengths = NULL;
MPI_Aint *iarray_of_displacements = NULL;

@@ -77,6 +77,12 @@ PROTOTYPE ERROR_CLASS type_create_struct(COUNT count,
FUNC_NAME);
}
}
#if OMPI_BIGCOUNT_SRC
OMPI_CHECK_MPI_COUNT_INT_CONVERSION_OVERFLOW(rc, count);
if (OMPI_SUCCESS != rc) {
return OMPI_ERRHANDLER_NOHANDLE_INVOKE(rc, FUNC_NAME);
}
#endif
}

#if OMPI_BIGCOUNT_SRC
@@ -97,7 +103,7 @@ PROTOTYPE ERROR_CLASS type_create_struct(COUNT count,
iarray_of_blocklengths = (int *)array_of_blocklengths;
iarray_of_displacements = (MPI_Aint *)array_of_displacements;
#endif
rc = ompi_datatype_create_struct( count, iarray_of_blocklengths, iarray_of_displacements,
rc = ompi_datatype_create_struct( icount, iarray_of_blocklengths, iarray_of_displacements,
array_of_types, newtype );
if( rc != MPI_SUCCESS ) {
ompi_datatype_destroy( newtype );
@@ -110,10 +116,10 @@ PROTOTYPE ERROR_CLASS type_create_struct(COUNT count,
}

{
const int* a_i[2] = {(int *)&count, iarray_of_blocklengths};
const int* a_i[2] = {(int *)&icount, iarray_of_blocklengths};

ompi_datatype_set_args( *newtype, count + 1, a_i, count, iarray_of_displacements,
count, array_of_types, MPI_COMBINER_STRUCT );
ompi_datatype_set_args( *newtype, icount + 1, a_i, icount, iarray_of_displacements,
icount, array_of_types, MPI_COMBINER_STRUCT );
}
#if OMPI_BIGCOUNT_SRC
free(iarray_of_blocklengths);