re PR fortran/53310 (EOSHIFT leaks memory)

2012-05-12  Tobias Burnus  <burnus@net-b.de>

        PR fortran/53310
        * intrinsics/eoshift2.c (eoshift2): Do not leak
        memory by allocating it in the loop.

From-SVN: r187419

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 4db2645500c9e4108ec165c1cf7dbef0808ef25d..8b2e8e777f0943f29e48cfe2dd3bb42d3b439ff2 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-12  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/53310
+       * intrinsics/eoshift2.c (eoshift2): Do not leak
+       memory by allocating it in the loop.
+
 2011-08-30  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        Backport from trunk

diff --git a/libgfortran/intrinsics/eoshift2.c b/libgfortran/intrinsics/eoshift2.c
index 2fbf62e118c70675e7b6b83df54738a80efc1c63..fe38d058b029eb7e59e9ee9cb3142df2ce0457d3 100644 (file)
--- a/libgfortran/intrinsics/eoshift2.c
+++ b/libgfortran/intrinsics/eoshift2.c
@@ -77,6 +77,12 @@ eoshift2 (gfc_array_char *ret, const gfc_array_char *array,
 
       ret->offset = 0;
       ret->dtype = array->dtype;
+
+      if (arraysize > 0)
+       ret->data = internal_malloc_size (size * arraysize);
+      else
+       ret->data = internal_malloc_size (1);
+
       for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++)
         {
          index_type ub, str;
@@ -90,12 +96,6 @@ eoshift2 (gfc_array_char *ret, const gfc_array_char *array,
              * GFC_DESCRIPTOR_STRIDE(ret,i-1);
 
          GFC_DIMENSION_SET(ret->dim[i], 0, ub, str);
-
-         if (arraysize > 0)
-           ret->data = internal_malloc_size (size * arraysize);
-         else
-           ret->data = internal_malloc_size (1);
-
         }
     }
   else if (unlikely (compile_options.bounds_check))