diff options
| author | Roland McGrath <roland@gnu.org> | 2005-10-17 09:05:18 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-10-17 09:05:18 +0000 |
| commit | 632e09c574a98502bff33da73b3a9aeebd7637f4 (patch) | |
| tree | 714dba846e052f79b17e7a622bc9716448c7d706 | |
| parent | 07e26b06f21bc84e983ee5810805831002572d4a (diff) | |
| download | glibc-632e09c574a98502bff33da73b3a9aeebd7637f4.tar.gz glibc-632e09c574a98502bff33da73b3a9aeebd7637f4.tar.xz glibc-632e09c574a98502bff33da73b3a9aeebd7637f4.zip | |
2005-07-24 Jakub Jelinek <jakub@redhat.com>
[BZ #1125] * posix/execvp.c (execvp): Change path_malloc to char *, free that pointer on failure.
| -rw-r--r-- | posix/execvp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/posix/execvp.c b/posix/execvp.c index 6f4e4b8566..8421bd048f 100644 --- a/posix/execvp.c +++ b/posix/execvp.c @@ -88,7 +88,7 @@ execvp (file, argv) else { char *path = getenv ("PATH"); - bool path_malloc = false; + char *path_malloc = NULL; if (path == NULL) { /* There is no `PATH' in the environment. @@ -100,7 +100,7 @@ execvp (file, argv) return -1; path[0] = ':'; (void) confstr (_CS_PATH, path + 1, len); - path_malloc = true; + path_malloc = path; } size_t len = strlen (file) + 1; @@ -108,8 +108,7 @@ execvp (file, argv) char *name = malloc (pathlen + len + 1); if (name == NULL) { - if (path_malloc) - free (path); + free (path_malloc); return -1; } /* Copy the file name at the top. */ @@ -190,8 +189,7 @@ execvp (file, argv) free (script_argv); free (name - pathlen); - if (path_malloc) - free (path); + free (path_malloc); } /* Return the error from the last attempt (probably ENOENT). */ |