ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

silence compiler warnings, avoid integer or buffer overflows

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-10-05 10:52:17 -04:00
parent 7fa020e574
commit 80da4c307c
4 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fortran/lammps.f90
View File

@ -1134,7 +1134,7 @@ CONTAINS
TYPE(lammps_variable_data) :: variable_data TYPE(lammps_variable_data) :: variable_data
TYPE(c_ptr) :: Cptr, Cname, Cgroup, Cveclength TYPE(c_ptr) :: Cptr, Cname, Cgroup, Cveclength
INTEGER :: length, i INTEGER(c_size_t) :: length, i
CHARACTER(KIND=c_char, LEN=1), DIMENSION(:), POINTER :: Cstring CHARACTER(KIND=c_char, LEN=1), DIMENSION(:), POINTER :: Cstring
INTEGER(c_int) :: datatype INTEGER(c_int) :: datatype
REAL(c_double), POINTER :: double => NULL() REAL(c_double), POINTER :: double => NULL()
@ -1370,7 +1370,6 @@ CONTAINS
INTEGER(c_int) :: ndata INTEGER(c_int) :: ndata
TYPE(c_ptr) :: Cdata, Cname, Cids TYPE(c_ptr) :: Cdata, Cname, Cids
INTEGER(c_int), PARAMETER :: Ctype = 0_c_int INTEGER(c_int), PARAMETER :: Ctype = 0_c_int
CHARACTER(LEN=100) :: error_msg
IF (count /= 1 .AND. count /= 3) THEN IF (count /= 1 .AND. count /= 3) THEN
CALL lmp_error(self, LMP_ERROR_ALL + LMP_ERROR_WORLD, & CALL lmp_error(self, LMP_ERROR_ALL + LMP_ERROR_WORLD, &
@ -1401,7 +1400,6 @@ CONTAINS
INTEGER(c_int) :: ndata INTEGER(c_int) :: ndata
TYPE(c_ptr) :: Cdata, Cname, Cids TYPE(c_ptr) :: Cdata, Cname, Cids
INTEGER(c_int), PARAMETER :: Ctype = 1_c_int INTEGER(c_int), PARAMETER :: Ctype = 1_c_int
CHARACTER(LEN=100) :: error_msg
IF (count /= 1 .AND. count /= 3) THEN IF (count /= 1 .AND. count /= 3) THEN
CALL lmp_error(self, LMP_ERROR_ALL + LMP_ERROR_WORLD, & CALL lmp_error(self, LMP_ERROR_ALL + LMP_ERROR_WORLD, &
@ -1494,7 +1492,6 @@ CONTAINS
INTEGER(c_int), PARAMETER :: Ctype = 0_c_int INTEGER(c_int), PARAMETER :: Ctype = 0_c_int
INTEGER(c_int) :: Cndata, Ccount INTEGER(c_int) :: Cndata, Ccount
TYPE(c_ptr) :: Cdata, Cname, Cids TYPE(c_ptr) :: Cdata, Cname, Cids
CHARACTER(LEN=100) :: error_msg
Cndata = SIZE(ids, KIND=c_int) Cndata = SIZE(ids, KIND=c_int)
Ccount = SIZE(data, KIND=c_int) / Cndata Ccount = SIZE(data, KIND=c_int) / Cndata
@ -1519,7 +1516,6 @@ CONTAINS
INTEGER(c_int), PARAMETER :: Ctype = 1_c_int INTEGER(c_int), PARAMETER :: Ctype = 1_c_int
INTEGER(c_int) :: Cndata, Ccount INTEGER(c_int) :: Cndata, Ccount
TYPE(c_ptr) :: Cdata, Cname, Cids TYPE(c_ptr) :: Cdata, Cname, Cids
CHARACTER(LEN=100) :: error_msg
Cndata = SIZE(ids, KIND=c_int) Cndata = SIZE(ids, KIND=c_int)
Ccount = SIZE(data, KIND=c_int) / Cndata Ccount = SIZE(data, KIND=c_int) / Cndata
@ -1628,7 +1624,7 @@ CONTAINS
INTEGER(c_int) :: Cidx, Csuccess INTEGER(c_int) :: Cidx, Csuccess
TYPE(c_ptr) :: Cptr TYPE(c_ptr) :: Cptr
CHARACTER(LEN=1,KIND=c_char), TARGET :: Cbuffer(LEN(buffer)+1) CHARACTER(LEN=1,KIND=c_char), TARGET :: Cbuffer(LEN(buffer)+1)
INTEGER :: i, strlen INTEGER(c_size_t) :: i, strlen
Cidx = idx - 1 Cidx = idx - 1
Cptr = C_LOC(Cbuffer(1)) Cptr = C_LOC(Cbuffer(1))
@ -1698,8 +1694,8 @@ CONTAINS
CLASS(lammps), INTENT(IN) :: self CLASS(lammps), INTENT(IN) :: self
CHARACTER(LEN=*), INTENT(OUT) :: buffer CHARACTER(LEN=*), INTENT(OUT) :: buffer
INTEGER, INTENT(OUT), OPTIONAL :: status INTEGER, INTENT(OUT), OPTIONAL :: status
INTEGER(c_int) :: buflen, Cstatus, i INTEGER(c_int) :: buflen, Cstatus
INTEGER(c_size_t) :: length INTEGER(c_size_t) :: i, length
TYPE(c_ptr) :: Cptr TYPE(c_ptr) :: Cptr
CHARACTER(LEN=1, KIND=c_char), POINTER :: c_string(:) CHARACTER(LEN=1, KIND=c_char), POINTER :: c_string(:)

8
unittest/fortran/test_fortran_extract_variable.f90
View File

@ -33,8 +33,7 @@ CONTAINS
CHARACTER(LEN=256) :: test_input_directory CHARACTER(LEN=256) :: test_input_directory
TYPE(c_ptr) :: c_test_input_directory, c_absolute_path, c_filename TYPE(c_ptr) :: c_test_input_directory, c_absolute_path, c_filename
CHARACTER(LEN=1,KIND=c_char), DIMENSION(:), POINTER :: F_absolute_path CHARACTER(LEN=1,KIND=c_char), DIMENSION(:), POINTER :: F_absolute_path
INTEGER :: i INTEGER(c_size_t) :: i, length
INTEGER(c_size_t) :: length
test_input_directory = lmp%extract_variable('input_dir') test_input_directory = lmp%extract_variable('input_dir')
c_test_input_directory = f2c_string(test_input_directory) c_test_input_directory = f2c_string(test_input_directory)
@ -91,7 +90,7 @@ FUNCTION f_lammps_with_C_args(argc, argv) BIND(C)
TYPE(c_ptr) :: f_lammps_with_C_args TYPE(c_ptr) :: f_lammps_with_C_args
CHARACTER(LEN=ARG_LENGTH), DIMENSION(argc) :: args CHARACTER(LEN=ARG_LENGTH), DIMENSION(argc) :: args
CHARACTER(LEN=1,KIND=c_char), DIMENSION(:), POINTER :: Cstr CHARACTER(LEN=1,KIND=c_char), DIMENSION(:), POINTER :: Cstr
INTEGER :: i, length, j INTEGER(c_size_t):: i, length, j
INTERFACE INTERFACE
FUNCTION c_strlen(str) BIND(C,name='strlen') FUNCTION c_strlen(str) BIND(C,name='strlen')
@ -346,12 +345,11 @@ FUNCTION f_lammps_extract_variable_atomfile(i) BIND(C)
f_lammps_extract_variable_atomfile = atom_data(i) f_lammps_extract_variable_atomfile = atom_data(i)
END FUNCTION f_lammps_extract_variable_atomfile END FUNCTION f_lammps_extract_variable_atomfile
FUNCTION f_lammps_extract_variable_python(i) BIND(C) FUNCTION f_lammps_extract_variable_python() BIND(C)
USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_int, c_double USE, INTRINSIC :: ISO_C_BINDING, ONLY : c_int, c_double
USE LIBLAMMPS USE LIBLAMMPS
USE keepstuff, ONLY : lmp USE keepstuff, ONLY : lmp
IMPLICIT NONE IMPLICIT NONE
INTEGER(c_int), INTENT(IN), VALUE :: i
REAL(c_double) :: f_lammps_extract_variable_python REAL(c_double) :: f_lammps_extract_variable_python
f_lammps_extract_variable_python = lmp%extract_variable('py') f_lammps_extract_variable_python = lmp%extract_variable('py')

1
unittest/fortran/test_fortran_gather_scatter.f90
View File

@ -190,7 +190,6 @@ SUBROUTINE f_lammps_scatter_atoms_subset_mask() BIND(C)
INTEGER(c_int), DIMENSION(:), ALLOCATABLE :: all_masks INTEGER(c_int), DIMENSION(:), ALLOCATABLE :: all_masks
INTEGER(c_int), DIMENSION(*), PARAMETER :: tags = [3,1] INTEGER(c_int), DIMENSION(*), PARAMETER :: tags = [3,1]
INTEGER(c_int), DIMENSION(2) :: masks INTEGER(c_int), DIMENSION(2) :: masks
INTEGER(c_int) :: swap
CALL lmp%gather_atoms('mask', 1_c_int, all_masks) CALL lmp%gather_atoms('mask', 1_c_int, all_masks)

4
unittest/fortran/wrap_extract_variable.cpp
View File

@ -165,7 +165,7 @@ TEST_F(LAMMPS_extract_variable, format)
{ {
f_lammps_setup_extract_variable(); f_lammps_setup_extract_variable();
int i; int i;
char str[10]; char str[16];
char *fstr; char *fstr;
for (i = 1; i <= 10; i++) { for (i = 1; i <= 10; i++) {
std::sprintf(str, "%.6G", std::exp(i)); std::sprintf(str, "%.6G", std::exp(i));
@ -180,7 +180,7 @@ TEST_F(LAMMPS_extract_variable, format_pad)
{ {
f_lammps_setup_extract_variable(); f_lammps_setup_extract_variable();
int i; int i;
char str[10]; char str[16];
char *fstr; char *fstr;
for (i = 1; i <= 10; i++) { for (i = 1; i <= 10; i++) {
std::sprintf(str, "%08.6G", std::exp(i)); std::sprintf(str, "%08.6G", std::exp(i));