https://gcc.gnu.org/bugzilla/show_bug.cgi?id=120191

--- Comment #20 from GCC Commits <cvs-commit at gcc dot gnu.org> ---
The releases/gcc-13 branch has been updated by Jakub Jelinek
<ja...@gcc.gnu.org>:

https://gcc.gnu.org/g:daed26377bd7f30832e39147c8dbae23f6b50632

commit r13-9670-gdaed26377bd7f30832e39147c8dbae23f6b50632
Author: Jakub Jelinek <ja...@redhat.com>
Date:   Tue May 13 14:19:25 2025 +0200

    libfortran: Fix up _gfortran_s{max,min}loc1_{4,8,16}_s{1,4} [PR120191]

    There is a bug in _gfortran_s{max,min}loc1_{4,8,16}_s{1,4} which the
    following testcase shows.
    The functions return but then crash in the caller.
    Seems that is because buffer overflows, I believe those functions for
    if (mask == NULL || *mask) condition being false are supposed to fill in
    the result array with all zeros (or allocate it and fill it with zeros).
    My understanding is the result array in that case is integer(kind={4,8,16})
    and should have the extents the character input array has.
    The problem is that it uses * string_len in the extent multiplication:
          extent[n] = GFC_DESCRIPTOR_EXTENT(array,n) * string_len;
    and
          extent[n] =
            GFC_DESCRIPTOR_EXTENT(array,n + 1) * string_len;
    which is I guess fine and desirable for the extents of the character array,
    but not for the extents of the destination array.  Yet the code uses
    that extent array for that purpose (and no other purposes).
    Here it uses it to set the dimensions for the case where it needs to
    allocate (as well as size):
          for (n = 0; n < rank; n++)
            {
              if (n == 0)
                str = 1;
              else
                str = GFC_DESCRIPTOR_STRIDE(retarray,n-1) * extent[n-1];
              GFC_DIMENSION_SET(retarray->dim[n], 0, extent[n] - 1, str);
            }
    Here it uses it for bounds checking of the destination:
          if (unlikely (compile_options.bounds_check))
            {
              for (n=0; n < rank; n++)
                {
                  index_type ret_extent;

                  ret_extent = GFC_DESCRIPTOR_EXTENT(retarray,n);
                  if (extent[n] != ret_extent)
                    runtime_error ("Incorrect extent in return value of"
                                   " MAXLOC intrinsic in dimension %ld:"
                                   " is %ld, should be %ld", (long int) n + 1,
                                   (long int) ret_extent, (long int)
extent[n]);
                }
            }
    and here to find out how many retarray elements to actually fill in each
    dimension:
      while(1)
        {
          *dest = 0;
          count[0]++;
          dest += dstride[0];
          n = 0;
          while (count[n] == extent[n])
            {
              /* When we get to the end of a dimension, reset it and increment
                 the next dimension.  */
              count[n] = 0;
              /* We could precalculate these products, but this is a less
                 frequently used path so probably not worth it.  */
              dest -= dstride[n] * extent[n];
    Seems maxloc1s.m4 and minloc1s.m4 are the only users of ifunction-s.m4,
    so we can change SCALAR_ARRAY_FUNCTION in there without breaking anything
    else.

    2025-05-13  Jakub Jelinek  <ja...@redhat.com>

            PR fortran/120191
            * m4/ifunction-s.m4 (SCALAR_ARRAY_FUNCTION): Don't multiply
            GFC_DESCRIPTOR_EXTENT(array,) by string_len.
            * generated/maxloc1_4_s1.c: Regenerate.
            * generated/maxloc1_4_s4.c: Regenerate.
            * generated/maxloc1_8_s1.c: Regenerate.
            * generated/maxloc1_8_s4.c: Regenerate.
            * generated/maxloc1_16_s1.c: Regenerate.
            * generated/maxloc1_16_s4.c: Regenerate.
            * generated/minloc1_4_s1.c: Regenerate.
            * generated/minloc1_4_s4.c: Regenerate.
            * generated/minloc1_8_s1.c: Regenerate.
            * generated/minloc1_8_s4.c: Regenerate.
            * generated/minloc1_16_s1.c: Regenerate.
            * generated/minloc1_16_s4.c: Regenerate.

            * gfortran.dg/pr120191_3.f90: New test.

    (cherry picked from commit 781cfc454b8dc24952fe7f4c5c409296dca505e1)

Reply via email to