diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2017-06-05 09:45:45 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2017-06-05 09:45:45 -0700 |
| commit | 11d2dbda38c1b3cafdb3f91a02134b2807a15c27 (patch) | |
| tree | b74831a23372312fedd65dfe5d52e681fdb7aa81 | |
| parent | a6135f6114697c7755590b26062668d18f267d2b (diff) | |
| download | zsh-11d2dbda38c1b3cafdb3f91a02134b2807a15c27.tar.gz zsh-11d2dbda38c1b3cafdb3f91a02134b2807a15c27.tar.xz zsh-11d2dbda38c1b3cafdb3f91a02134b2807a15c27.zip | |
41225: sethparam() should not attempt to change special parameters into hashes
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/params.c | 17 |
2 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index d67ea71d5..634e75f1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-06-05 Barton E. Schaefer <schaefer@zsh.org> + + * 41225: Src/params.c: sethparam() should not attempt to change + special parameters into hashes + 2017-06-01 Peter Stephenson <p.stephenson@samsung.com> * 41191: Src/Zle/textobjects.c, Src/Zle/zle.h, diff --git a/Src/params.c b/Src/params.c index d92dd228a..6fbee880c 100644 --- a/Src/params.c +++ b/Src/params.c @@ -3242,12 +3242,17 @@ sethparam(char *s, char **val) if (!(v = fetchvalue(&vbuf, &s, 1, SCANPM_ASSIGNING))) { createparam(t, PM_HASHED); checkcreate = 1; - } else if (!(PM_TYPE(v->pm->node.flags) & PM_HASHED) && - !(v->pm->node.flags & PM_SPECIAL)) { - unsetparam(t); - /* no WARNCREATEGLOBAL check here as parameter already existed */ - createparam(t, PM_HASHED); - v = NULL; + } else if (!(PM_TYPE(v->pm->node.flags) & PM_HASHED)) { + if (!(v->pm->node.flags & PM_SPECIAL)) { + unsetparam(t); + /* no WARNCREATEGLOBAL check here as parameter already existed */ + createparam(t, PM_HASHED); + v = NULL; + } else { + zerr("%s: can't change type of a special parameter", t); + unqueue_signals(); + return NULL; + } } if (!v) if (!(v = fetchvalue(&vbuf, &t, 1, SCANPM_ASSIGNING))) { |