diff options
author | Peter Stephenson <pws@zsh.org> | 2015-07-23 10:04:09 +0100 |
---|---|---|
committer | Peter Stephenson <pws@zsh.org> | 2015-07-23 10:04:09 +0100 |
commit | bbd4cae6ad3dc52702e61397cbab9197e55b21b5 (patch) | |
tree | 20de30ecd8d878b0a7c8b4eca003e918c5d5f851 | |
parent | 28a962f557952a6001d37f4f4f7034361d11bf89 (diff) | |
download | zsh-bbd4cae6ad3dc52702e61397cbab9197e55b21b5.tar.gz zsh-bbd4cae6ad3dc52702e61397cbab9197e55b21b5.tar.xz zsh-bbd4cae6ad3dc52702e61397cbab9197e55b21b5.zip |
35872: protect against NULL pointers in unmeta
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | Src/utils.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index dbdb22319..418d922ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2015-07-23 Peter Stephenson <p.stephenson@samsung.com> + * 35872: Src/utils.c: protect against NULL pointers in unmeta(). + * 35849: Src/exec.c, Src/jobs.c, Test/D03procsubst.ztst: close file descriptors from process substitution in parent after fork. diff --git a/Src/utils.c b/Src/utils.c index ba9056459..0acab88ff 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -4401,7 +4401,10 @@ unmeta(const char *file_name) char *p; const char *t; int newsz, meta; - + + if (!file_name) + return NULL; + meta = 0; for (t = file_name; *t; t++) { if (*t == Meta) |