OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backport: re PR libfortran/80727 (Crash of runtime gfortran library during integer transformation) 

2017-05-17  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	Backport from trunk
	PR libgfortran/80727
	* transfer.c (read_sf_internal): Remove bogus code to detect EOR.
	(read_block_form): For internal units, generate EOR if no more
	bytes left in unit and we are trying to read with ADVANCE='NO'.

	* gfortran.dg/read_3.f90: New test.

From-SVN: r248167
This commit is contained in:
Jerry DeLisle 2017-05-17 20:00:53 +00:00
parent d96f3d3658
commit 6b8977c377
4 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2017-05-17 Jerry DeLisle <jvdelisle@gcc.gnu.org>
Backport from trunk
PR libgfortran/80727
* gfortran.dg/read_3.f90: New test.
2017-05-17 Jerry DeLisle <jvdelisle@gcc.gnu.org>
Backport from trunk

13
gcc/testsuite/gfortran.dg/read_3.f90 Normal file
View File

@ -0,0 +1,13 @@
! { dg-do run }
! PR80727 Crash of runtime gfortran library during integer transformation
! Note: before the patch this was giving an incorrect EOR error on READ.
program gfortran_710_io_bug
character str*4
integer(4) :: i4
str =''
i = 256
write(str,fmt='(a)') i
i = 0
read ( unit=str(1:4), fmt='(a)' ) i4
if (i4.ne.256) call abort
end program gfortran_710_io_bug

8
libgfortran/ChangeLog
View File

@ -1,3 +1,11 @@
2017-05-17 Jerry DeLisle <jvdelisle@gcc.gnu.org>
Backport from trunk
PR libgfortran/80727
* transfer.c (read_sf_internal): Remove bogus code to detect EOR.
(read_block_form): For internal units, generate EOR if no more
bytes left in unit and we are trying to read with ADVANCE='NO'.
2017-05-02 Release Manager
* GCC 7.1.0 released.

27
libgfortran/io/transfer.c
View File

@ -272,12 +272,6 @@ read_sf_internal (st_parameter_dt *dtp, int *length)
return NULL;
}
if (base && *base == 0)
{
generate_error (&dtp->common, LIBERROR_EOR, NULL);
return NULL;
}
dtp->u.p.current_unit->bytes_left -= *length;
if (((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0) ||
@ -470,11 +464,24 @@ read_block_form (st_parameter_dt *dtp, int *nbytes)
}
}
if (unlikely (dtp->u.p.current_unit->bytes_left == 0
&& !is_internal_unit(dtp)))
if (is_internal_unit(dtp))
{
hit_eof (dtp);
return NULL;
if (*nbytes > 0 && dtp->u.p.current_unit->bytes_left == 0)
{
if (dtp->u.p.advance_status == ADVANCE_NO)
{
generate_error (&dtp->common, LIBERROR_EOR, NULL);
return NULL;
}
}
}
else
{
if (unlikely (dtp->u.p.current_unit->bytes_left == 0))
{
hit_eof (dtp);
return NULL;
}
}
*nbytes = dtp->u.p.current_unit->bytes_left;