diff options
| author | Philippe Altherr <philippe.altherr@gmail.com> | 2026-06-08 17:19:08 -0700 |
|---|---|---|
| committer | Bart Schaefer <schaefer@zsh.org> | 2026-06-08 17:19:08 -0700 |
| commit | edd6cc82994c6c6741aa32b7bd794128a721f6e4 (patch) | |
| tree | 807289427a0674fe6ab182e69c8daf131d1f56fa /Src/Modules | |
| parent | ChangeLog for preceding commit (diff) | |
| download | zsh-edd6cc82994c6c6741aa32b7bd794128a721f6e4.tar zsh-edd6cc82994c6c6741aa32b7bd794128a721f6e4.tar.gz zsh-edd6cc82994c6c6741aa32b7bd794128a721f6e4.tar.bz2 zsh-edd6cc82994c6c6741aa32b7bd794128a721f6e4.tar.lz zsh-edd6cc82994c6c6741aa32b7bd794128a721f6e4.tar.xz zsh-edd6cc82994c6c6741aa32b7bd794128a721f6e4.tar.zst zsh-edd6cc82994c6c6741aa32b7bd794128a721f6e4.zip | |
54475: Don't perform dereferencing when looking up certain special parameters
Tweaked to account for workers/54328
Diffstat (limited to 'Src/Modules')
| -rw-r--r-- | Src/Modules/watch.c | 4 | ||||
| -rw-r--r-- | Src/Modules/zftp.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Src/Modules/watch.c b/Src/Modules/watch.c index c4571c7e7..dc601619f 100644 --- a/Src/Modules/watch.c +++ b/Src/Modules/watch.c @@ -747,9 +747,9 @@ boot_(UNUSED(Module m)) /* These two parameters are only set to defaults if not set. * So setting them in .zshrc will not be enough to load the * module. It's useless until the watch array is set anyway. */ - if (!paramtab->getnode(paramtab, "WATCHFMT")) + if (!realparamtab->getnode2(realparamtab, "WATCHFMT")) setsparam("WATCHFMT", ztrdup_metafy(default_watchfmt)); - if (!paramtab->getnode(paramtab, "LOGCHECK")) + if (!realparamtab->getnode2(realparamtab, "LOGCHECK")) setiparam("LOGCHECK", 60); addprepromptfn(&checksched); diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 29170ad11..8a8fb9dd5 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -492,7 +492,7 @@ zfsetparam(char *name, void *val, int flags) Param pm = NULL; int type = (flags & ZFPM_INTEGER) ? PM_INTEGER : PM_SCALAR; - if (!(pm = (Param) paramtab->getnode(paramtab, name)) + if (!(pm = (Param) realparamtab->getnode2(realparamtab, name)) || (pm->node.flags & PM_UNSET)) { /* * just make it readonly when creating, in case user @@ -526,7 +526,7 @@ zfunsetparam(char *name) { Param pm; - if ((pm = (Param) paramtab->getnode(paramtab, name))) { + if ((pm = (Param) realparamtab->getnode2(realparamtab, name))) { pm->node.flags &= ~PM_READONLY; unsetparam_pm(pm, 0, 1); } |