diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index b6600735ef4..c3e61856722 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-27  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/54384
+	* trans-expr.c (gfc_trans_arrayfunc_assign): Free se.ss
+	and loop.
+
 2012-08-27  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/41093
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index ebaa2386055..3ab7d5d5b74 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -6781,6 +6781,11 @@ gfc_trans_arrayfunc_assign (gfc_expr * expr1, gfc_expr * expr2)
   gfc_conv_function_expr (&se, expr2);
   gfc_add_block_to_block (&se.pre, &se.post);
 
+  if (ss)
+    gfc_cleanup_loop (&loop);
+  else
+    gfc_free_ss_chain (se.ss);
+
   return gfc_finish_block (&se.pre);
 }