mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-11 00:15:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR fortran/27304 (gfortran: Warn/abort when format in write does not fit passed arguments)

Browse Source 
2006-04-28  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/27304
	* io/transfer.c (formatted_transfer_scalar):  Generate error if data
	descriptors are exhausted.
	* io/format.c (next_format0): Fix comment.

From-SVN: r113363
This commit is contained in:
Jerry DeLisle 2006-04-28 23:55:30 +00:00
parent 4f8bdef929
commit c4ee121ad5
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libgfortran/ChangeLog
View File

@ -1,3 +1,10 @@
2006-04-28 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/27304
* io/transfer.c (formatted_transfer_scalar): Generate error if data
descriptors are exhausted.
* io/format.c (next_format0): Fix comment.
2006-04-22 Jerry DeLisle <jvdelisle@gcc.gnu.org> 2006-04-22 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/20257 PR libgfortran/20257

2
libgfortran/io/format.c
View File

@ -1059,7 +1059,7 @@ next_format0 (fnode * f)
/* next_format()-- Return the next format node. If the format list /* next_format()-- Return the next format node. If the format list
* ends up being exhausted, we do reversion. Reversion is only * ends up being exhausted, we do reversion. Reversion is only
* allowed if the we've seen a data descriptor since the * allowed if the we've seen a data descriptor since the
* initialization or the last reversion. We return NULL if the there * initialization or the last reversion. We return NULL if there
* are no more data descriptors to return (which is an error * are no more data descriptors to return (which is an error
* condition). */ * condition). */

8
libgfortran/io/transfer.c
View File

@ -670,7 +670,13 @@ formatted_transfer_scalar (st_parameter_dt *dtp, bt type, void *p, int len,
f = next_format (dtp); f = next_format (dtp);
if (f == NULL) if (f == NULL)
return; /* No data descriptors left (already raised). */ {
/* No data descriptors left. */
if (n > 0)
generate_error (&dtp->common, ERROR_FORMAT,
"Insufficient data descriptors in format after reversion");
return;
}
/* Now discharge T, TR and X movements to the right. This is delayed /* Now discharge T, TR and X movements to the right. This is delayed
until a data producing format to suppress trailing spaces. */ until a data producing format to suppress trailing spaces. */