re PR libfortran/34291 (Segfault in io/list_read.c handling of end conditions)

2007-11-30  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libfortran/34291
	* io/list_read.c (read_character): When reading an unquoted string,
	return if special characters that could signify the end of the namelist
	read are encountered.

From-SVN: r130548

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 69fca512c97d1bc317bce4737cb1fba707f40eca..def1ef1c2ad6275a0ffe47106085305948b6887a 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-30  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR libfortran/34291
+       * io/list_read.c (read_character): When reading an unquoted string,
+       return if special characters that could signify the end of the namelist
+       read are encountered.
+
 2007-11-29  Steven G. Kargl  <kargls@comcast.net>
 
        PR libfortran/33583

diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index 96cef54e7afb6fbbbf248a427226d695e43d6fb6..586e356d1053d83c1fb6885db8837d1869323782 100644 (file)
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -896,7 +896,8 @@ read_character (st_parameter_dt *dtp, int length __attribute__ ((unused)))
       if (dtp->u.p.namelist_mode)
        {
          if (dtp->u.p.current_unit->flags.delim == DELIM_APOSTROPHE
-             || dtp->u.p.current_unit->flags.delim == DELIM_QUOTE)
+             || dtp->u.p.current_unit->flags.delim == DELIM_QUOTE
+             || c == '&' || c == '$' || c == '/')
            {
              unget_char (dtp, c);
              return;
@@ -923,8 +924,9 @@ read_character (st_parameter_dt *dtp, int length __attribute__ ((unused)))
                      goto get_string;
                    }
                }
- 
+
              l_push_char (dtp, c);
+
              if (c == '=' || c == '(')
                {
                  dtp->u.p.item_count = 0;
@@ -936,6 +938,7 @@ read_character (st_parameter_dt *dtp, int length __attribute__ ((unused)))
 
          /* The string is too long to be a valid object name so assume that it
             is a string to be read in as a value.  */
+         dtp->u.p.item_count = 0;
          dtp->u.p.line_buffer_enabled = 1;
          goto get_string;
        }