diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2012-01-12 11:58:34 +0200 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2012-01-12 11:58:34 +0200 |
| commit | cb735e3800862a9350f56bdb775b4a8627226455 (patch) | |
| tree | ecec08b90b14048a337d070bc48ab04deedc35ed /libgfortran | |
| parent | 725a74a517294915302c713ee309340779514621 (diff) | |
| download | gcc-cb735e3800862a9350f56bdb775b4a8627226455.tar.gz | |
PR 51803 Avoid malloc if getcwd fails or is not available.
2012-01-12 Janne Blomqvist <jb@gcc.gnu.org>
Tobias Burnus <burnus@net-b.de>
PR libfortran/51803
* runtime/main.c (store_exe_path): Avoid malloc if getcwd fails or
is not available.
Co-Authored-By: Tobias Burnus <burnus@net-b.de>
From-SVN: r183122
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 8 | ||||
| -rw-r--r-- | libgfortran/runtime/main.c | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index b1e2b049b4f..7072e182297 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,10 @@ +2012-01-12 Janne Blomqvist <jb@gcc.gnu.org> + Tobias Burnus <burnus@net-b.de> + + PR libfortran/51803 + * runtime/main.c (store_exe_path): Avoid malloc if getcwd fails or + is not available. + 2012-01-11 Tobias Burnus <burnus@net-b.de> * runtime/main.c (store_exe_path): Fix absolute path @@ -5,6 +12,7 @@ 2012-01-11 Janne Blomqvist <jb@gcc.gnu.org> Mike Stump <mikestump@comcast.net> + PR libfortran/51803 * runtime/main.c (store_exe_path): Handle getcwd failure and lack of the function better. diff --git a/libgfortran/runtime/main.c b/libgfortran/runtime/main.c index 9ee47022cc9..79659e52bcd 100644 --- a/libgfortran/runtime/main.c +++ b/libgfortran/runtime/main.c @@ -124,12 +124,17 @@ store_exe_path (const char * argv0) #ifdef HAVE_GETCWD cwd = getcwd (buf, sizeof (buf)); - if (!cwd) - cwd = "."; #else - cwd = "."; + cwd = NULL; #endif + if (!cwd) + { + exe_path = argv0; + please_free_exe_path_when_done = 0; + return; + } + /* exe_path will be cwd + "/" + argv[0] + "\0". This will not work if the executable is not in the cwd, but at this point we're out of better ideas. */ |