[Bug fortran/41478] Corrupted memory using PACK for derived-types with allocated components

[janus at gcc dot gnu dot org]

------- Comment #12 from janus at gcc dot gnu dot org  2009-10-20 20:54 -------
Here is a simple patch which cures the segfault in comment #9. However it does
not tackle the double-free issue.


Index: libgfortran/intrinsics/pack_generic.c    
===================================================================
--- libgfortran/intrinsics/pack_generic.c       (Revision 153009)  
+++ libgfortran/intrinsics/pack_generic.c       (Arbeitskopie)     
@@ -350,7 +350,7 @@ pack (gfc_array_char *ret, const gfc_array_char *a

     case GFC_DTYPE_DERIVED_2:
       if (GFC_UNALIGNED_2(ret->data) || GFC_UNALIGNED_2(array->data)
-         || GFC_UNALIGNED_2(vector->data))
+         || (vector && GFC_UNALIGNED_2(vector->data)))
        break;
       else
        {
@@ -361,7 +361,7 @@ pack (gfc_array_char *ret, const gfc_array_char *a

     case GFC_DTYPE_DERIVED_4:
       if (GFC_UNALIGNED_4(ret->data) || GFC_UNALIGNED_4(array->data)
-         || GFC_UNALIGNED_4(vector->data))
+         || (vector && GFC_UNALIGNED_4(vector->data)))
        break;
       else
        {
@@ -372,7 +372,7 @@ pack (gfc_array_char *ret, const gfc_array_char *a

     case GFC_DTYPE_DERIVED_8:
       if (GFC_UNALIGNED_8(ret->data) || GFC_UNALIGNED_8(array->data)
-         || GFC_UNALIGNED_8(vector->data))
+         || (vector && GFC_UNALIGNED_8(vector->data)))
        break;
       else
        {
@@ -383,7 +383,7 @@ pack (gfc_array_char *ret, const gfc_array_char *a
 #ifdef HAVE_GFC_INTEGER_16
     case GFC_DTYPE_DERIVED_16:
       if (GFC_UNALIGNED_16(ret->data) || GFC_UNALIGNED_16(array->data)
-         || GFC_UNALIGNED_16(vector->data))
+         || (vector && GFC_UNALIGNED_16(vector->data)))
        break;
       else
        {


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41478