re PR libfortran/24416 (Wrong reading following namelist reading)

2005-10-24  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/24416
	* libgfortran/io/list_read.c (namelist_read): Exit with call to
	free_saved () so that character strings do not accumulate.

2005-10-24  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran/24416
	gfortran.dg/namelist_char_only.f90: New test.

From-SVN: r105862

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fa6e53c018cb8dc0793d81f29fa8ba3a38b80f4f..1151980d511abff5d9ae367b040c216c90c6e52f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-24  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/24416
+       gfortran.dg/namelist_char_only.f90: New test.
+
 2005-10-24  Asher Langton  <langton2@llnl.gov>
 
        PR fortran/17031

diff --git a/gcc/testsuite/gfortran.dg/namelist_char_only.f90 b/gcc/testsuite/gfortran.dg/namelist_char_only.f90
new file mode 100644 (file)
index 0000000..eb2d7ea
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/namelist_char_only.f90
@@ -0,0 +1,29 @@
+! { dg-do run }
+! { dg-options "-O0" }
+! Test patch for PR24416.f90 - a used to come back from the read with var
+! prepended.
+!
+  IMPLICIT NONE
+  CHARACTER(len=10)  :: var = "hello"
+  character(len=10)  :: a = ""
+  NAMELIST /inx/ var
+
+  OPEN(unit=11, status='scratch')
+  write (11, *) "&INX"
+  write (11, *) "  var = 'goodbye'"
+  write (11, *) "&END"
+  rewind (11)
+
+  READ(11,NML=inx)
+  CLOSE(11)
+
+  OPEN(unit=11, status='scratch')
+  write (11, *) "alls_well"
+  rewind (11)
+
+  READ(11,*) a
+  CLOSE(11)
+
+  if (a /= "alls_well") call abort ()
+
+END
\ No newline at end of file

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 6dd23590d523e443f1bfd9e0927715ad0160ebde..52ad1a91f642a42eb575513daa9de6ad5d0c43f8 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,9 +1,15 @@
+2005-10-24  Paul Thomas  <pault@gcc.gnu.org>
+
+       PR fortran/24416
+       * libgfortran/io/list_read.c (namelist_read): Exit with call to
+       free_saved () so that character strings do not accumulate.
+
 2005-10-23  Jerry DeLisle  <jvdelisle@verizon.net>
 
-        PR libgfortran/24489
-        * io/transfer.c (read_block): Change the order of execution to not read
-        past end-of-record.
-        (read_block_direct): Same change.
+       PR libgfortran/24489
+       * io/transfer.c (read_block): Change the order of execution to not read
+       past end-of-record.
+       (read_block_direct): Same change.
 
 2005-10-23  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
 

diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index c3510f6ae61743b6f3375ec232671356dd12cce9..2e1717ab463d62c82b38eefce782d62e2ebd1ff2 100644 (file)
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -2364,13 +2364,14 @@ find_nml_name:
         }
 
    }
-
+  free_saved ();
   return;
 
   /* All namelist error calls return from here */
 
 nml_err_ret:
 
+  free_saved ();
   generate_error (ERROR_READ_VALUE , nml_err_msg);
   return;
 }