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

avoid out-of-bounds memory access when registering fix external callbacks

Browse Source
This commit is contained in:
Axel Kohlmeyer
2025-06-21 16:37:21 -04:00
parent e3b1d27e0a
commit aecc85e3d5
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fortran/lammps.f90
View File

@ -3440,6 +3440,7 @@ CONTAINS
TYPE(c_ptr) :: c_id, c_caller TYPE(c_ptr) :: c_id, c_caller
TYPE(c_funptr) :: c_callback TYPE(c_funptr) :: c_callback
INTEGER :: i, this_fix INTEGER :: i, this_fix
TYPE(fix_external_data), DIMENSION(:), ALLOCATABLE :: tmp_ext_data
c_id = f2c_string(id) c_id = f2c_string(id)
IF (ALLOCATED(ext_data)) THEN IF (ALLOCATED(ext_data)) THEN
@ -3451,9 +3452,13 @@ CONTAINS
END IF END IF
END DO END DO
IF (this_fix > SIZE(ext_data)) THEN IF (this_fix > SIZE(ext_data)) THEN
! reallocates ext_data; this requires us to re-bind "caller" on the C ! reallocate ext_data in a pre-fortran 2008 compatible way.
ALLOCATE(tmp_ext_data(this_fix))
tmp_ext_data(1:this_fix-1) = ext_data(1:this_fix-1)
tmp_ext_data(this_fix) = fix_external_data()
CALL move_alloc(tmp_ext_data, ext_data)
! this requires us to re-bind "caller" on the C
! side to the new data structure, which likely moved to a new address ! side to the new data structure, which likely moved to a new address
ext_data = [ext_data, fix_external_data()] ! extends ext_data by 1
CALL rebind_external_callback_data() CALL rebind_external_callback_data()
END IF END IF
ELSE ELSE