Commit 1c385ff

committed

Addition of checks on the size of array and index in sort_index

1 parent db0dbc8 commit 1c385ffCopy full SHA for 1c385ff

File tree

+26

-2

lines changed

+26

-2

lines changed

Lines changed: 2 additions & 1 deletion

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,15 @@`
	`1`	`+program example_sort_index`
	`2`	`+ use stdlib_sorting, only: sort_index`
	`3`	`+ implicit none`
	`4`	`+ integer, allocatable :: array(:)`
	`5`	`+ integer, allocatable :: index(:)`
	`6`	`+`
	`7`	`+ array = [5, 4, 3, 1, 10, 4, 9]`
	`8`	`+ allocate(index, mold=array)`
	`9`	`+`
	`10`	`+ call sort_index(array, index)`
	`11`	`+`
	`12`	`+ print *, array !print [1, 3, 4, 4, 5, 9, 10]`
	`13`	`+ print *, index !print [4, 3, 2, 6, 1, 7, 5]`
	`14`	`+`
	`15`	`+end program example_sort_index`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ contains`
`93`	`93`	`! deal with Fortran arrays of intrinsic types and not the full generality`
`94`	`94`	`! of Rust's arrays and lists for arbitrary types. It also adds the`
`95`	`95`	! estimation of the optimal `run size` as suggested in Tim Peters'
`96`		-! original listsort.txt, and the optional `work` and `iwork` arraya to be
	`96`	+! original listsort.txt, and the optional `work` and `iwork` arrays to be
`97`	`97`	`! used as scratch memory.`
`98`	`98`
`99`	`99`	`${t1},ドル intent(inout) :: array(0:)`
`@@ -106,8 +106,16 @@ contains`
`106`	`106`	`${t2},ドル allocatable :: buf(:)`
`107`	`107`	`${ti},ドル allocatable :: ibuf(:)`
`108`	`108`
	`109`	`+ if ( size(array, kind=int_index) > huge(1_${ki}$) ) then`
	`110`	`+ error stop "Too many entries for the chosen kind."`
	`111`	`+ end if`
	`112`	`+`
`109`	`113`	`array_size = size(array, kind=${ki}$)`
`110`	`114`
	`115`	`+ if ( size(index, kind=${ki}$) < array_size ) then`
	`116`	`+ error stop "index array is too small."`
	`117`	`+ end if`
	`118`	`+`
`111`	`119`	`do i = 0, array_size-1`
`112`	`120`	`index(i) = i+1`
`113`	`121`	`end do`

Comments

(0)