@@ -759,28 +759,22 @@ static struct
759759#endif /* HAVE_MNTENT */
760760};
761761
762+ #define OPEN_TEMP_EXEC_FILE_OPTS_COUNT \
763+ (sizeof (open_temp_exec_file_opts) / sizeof (*open_temp_exec_file_opts))
764+
762765/* Current index into open_temp_exec_file_opts. */
763- static int open_temp_exec_file_opts_idx = 0 ;
766+ static size_t open_temp_exec_file_opts_idx = 0 ;
764767
765768/* Reset a current multi-call func, then advances to the next entry.
766- If we're at the last, go back to the first and return nonzero,
767- otherwise return zero. */
769+ Return nonzero after advancing past the last entry. */
768770static int
769771open_temp_exec_file_opts_next (void )
770772{
771773 if (open_temp_exec_file_opts [open_temp_exec_file_opts_idx ].repeat )
772774 open_temp_exec_file_opts [open_temp_exec_file_opts_idx ].func (NULL );
773775
774776 open_temp_exec_file_opts_idx ++ ;
775- if (open_temp_exec_file_opts_idx
776- == (sizeof (open_temp_exec_file_opts )
777- / sizeof (* open_temp_exec_file_opts )))
778- {
779- open_temp_exec_file_opts_idx = 0 ;
780- return 1 ;
781- }
782-
783- return 0 ;
777+ return open_temp_exec_file_opts_idx == OPEN_TEMP_EXEC_FILE_OPTS_COUNT ;
784778}
785779
786780/* Return a file descriptor of a temporary zero-sized file in a
@@ -790,6 +784,9 @@ open_temp_exec_file (void)
790784{
791785 int fd ;
792786
787+ if (open_temp_exec_file_opts_idx == OPEN_TEMP_EXEC_FILE_OPTS_COUNT )
788+ return -1 ;
789+
793790 do
794791 {
795792 fd = open_temp_exec_file_opts [open_temp_exec_file_opts_idx ].func
@@ -873,6 +870,7 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
873870 if (!offset )
874871 {
875872 close (execfd );
873+ execfd = -1 ;
876874 goto retry_open ;
877875 }
878876 if (ftruncate (execfd , offset ) != 0 )
@@ -885,6 +883,7 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
885883 return MFAIL ;
886884 }
887885 else if (!offset
886+ && open_temp_exec_file_opts_idx < OPEN_TEMP_EXEC_FILE_OPTS_COUNT
888887 && open_temp_exec_file_opts [open_temp_exec_file_opts_idx ].repeat )
889888 open_temp_exec_file_opts_next ();
890889
0 commit comments