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

[libgfortran] Fix uninitialized variable use in fallback_access 

I've been tracking down a bug in a Fortran program on a newlib target and it boils down to fallback_access doing something bad.
The unconditional calls to close cause havoc when open doesn't get called due to the short-circuiting in the if-statement above
because the fd is uninitialised. In my environment GCC ends up calling close on file descriptor 0, thus trying to close stdin.

This patch tightens up the calling so that close is called only when the corresponding open call succeeded.
With this my runtime failure disappears.

Bootstrapped and tested on aarch64-none-linux-gnu.
Though that doesn't exercise this call I hope it's an obviously correct change. 

	* io/unix.c (fallback_access): Avoid calling close on
	uninitialized file descriptor.

From-SVN: r264305
This commit is contained in:
Kyrylo Tkachov 2018-09-14 09:22:01 +00:00 committed by Kyrylo Tkachov
parent 7efd5ff31d
commit ef5057c89e
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libgfortran/ChangeLog
View File

@ -1,3 +1,8 @@
2018-09-14 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
* io/unix.c (fallback_access): Avoid calling close on
uninitialized file descriptor.
2018-09-12 Kwok Cheung Yeung <kcy@codesourcery.com>
* runtime/minimal.c (estr_write): Define in terms of write.

20
libgfortran/io/unix.c
View File

@ -150,13 +150,21 @@ fallback_access (const char *path, int mode)
{
int fd;
if ((mode & R_OK) && (fd = open (path, O_RDONLY)) < 0)
return -1;
close (fd);
if (mode & R_OK)
{
if ((fd = open (path, O_RDONLY)) < 0)
return -1;
else
close (fd);
}
if ((mode & W_OK) && (fd = open (path, O_WRONLY)) < 0)
return -1;
close (fd);
if (mode & W_OK)
{
if ((fd = open (path, O_WRONLY)) < 0)
return -1;
else
close (fd);
}
if (mode == F_OK)
{