From 11d2dbda38c1b3cafdb3f91a02134b2807a15c27 Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Mon, 5 Jun 2017 09:45:45 -0700 Subject: 41225: sethparam() should not attempt to change special parameters into hashes --- Src/params.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'Src') 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))) { -- cgit 1.4.1