summaryrefslogtreecommitdiff
path: root/posix/wordexp.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-07-01 21:13:35 +0000
committerUlrich Drepper <drepper@redhat.com>1999-07-01 21:13:35 +0000
commitc5f57c58cae865ec63448282295bb078fc935d39 (patch)
treeb43d57610de7ab644aec06ed14019087ae84f7e8 /posix/wordexp.c
parent1d863dc0b41da22b5a06110d67b47a0f102cb639 (diff)
downloadglibc-c5f57c58cae865ec63448282295bb078fc935d39.tar.gz
Update.
1999-07-01 Andreas Jaeger <aj@arthur.rhein-neckar.de> * inet/rcmd.c (__icheckhost): Fix typo in last patch. 1999-07-01 Andreas Jaeger <aj@arthur.rhein-neckar.de> * wcsmbs/wcschr.c (wcschr): Fix last patch: Add missing semicolon. * wcsmbs/wcsrchr.c (wcsrchr): Likewise. 1999-07-01 Andreas Jaeger <aj@arthur.rhein-neckar.de> * posix/wordexp.c (parse_tilde): Handle failing call to get.*_r functions correctly for non-existing entry. * sysdeps/posix/cuserid.c (cuserid): Likewise. * sysdeps/posix/getaddrinfo.c (gaih_inet_serv): Likewise.
Diffstat (limited to 'posix/wordexp.c')
-rw-r--r--posix/wordexp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/posix/wordexp.c b/posix/wordexp.c
index c43d608aba..b6cf85af32 100644
--- a/posix/wordexp.c
+++ b/posix/wordexp.c
@@ -311,7 +311,7 @@ parse_tilde (char **word, size_t *word_length, size_t *max_length,
buffer = __alloca (buflen);
}
- if (result == 0 && pwd.pw_dir != NULL)
+ if (result == 0 && tpwd != NULL && pwd.pw_dir != NULL)
{
*word = w_addstr (*word, word_length, max_length, pwd.pw_dir);
if (*word == NULL)
@@ -340,7 +340,7 @@ parse_tilde (char **word, size_t *word_length, size_t *max_length,
buffer = __alloca (buflen);
}
- if (result == 0 && pwd.pw_dir)
+ if (result == 0 && tpwd != NULL && pwd.pw_dir)
*word = w_addstr (*word, word_length, max_length, pwd.pw_dir);
else
{