From: Bart Schaefer <schaefer@brasslantern.com>
To: Zsh hackers list <zsh-workers@zsh.org>
Subject: [PATCH] Bad autoloaded parameter in module crashes shell
Date: Sat, 18 Feb 2023 09:03:44 -0800 [thread overview]
Message-ID: <CAH+w=7bPmEVD4hU-ChXxYw1OPycPHhJ8gp240UiTeEHaBvLD+Q@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
When setsparam() fails during add_autoparam(), the shell crashes.
Patch attached.
I'm not entirely sure -1 is the correct value to return on this error.
[-- Attachment #2: bad-autoload.txt --]
[-- Type: text/plain, Size: 963 bytes --]
diff --git a/Src/module.c b/Src/module.c
index 6cf442270..a6005f30b 100644
--- a/Src/module.c
+++ b/Src/module.c
@@ -1198,6 +1198,7 @@ add_autoparam(const char *module, const char *pnam, int flags)
{
Param pm;
int ret;
+ int ne = noerrs;
queue_signals();
if ((ret = checkaddparam(pnam, (flags & FEAT_IGNORE)))) {
@@ -1212,14 +1213,18 @@ add_autoparam(const char *module, const char *pnam, int flags)
return ret == 2 ? 0 : -1;
}
- pm = setsparam(dupstring(pnam), ztrdup(module));
-
- pm->node.flags |= PM_AUTOLOAD;
- if (flags & FEAT_AUTOALL)
- pm->node.flags |= PM_AUTOALL;
+ noerrs = 2;
+ if ((pm = setsparam(dupstring(pnam), ztrdup(module)))) {
+ pm->node.flags |= PM_AUTOLOAD;
+ if (flags & FEAT_AUTOALL)
+ pm->node.flags |= PM_AUTOALL;
+ ret = 0;
+ } else
+ ret = -1;
+ noerrs = ne;
unqueue_signals();
- return 0;
+ return ret;
}
/* Remove a parameter added with add_autoparam() */
reply other threads:[~2023-02-18 17:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAH+w=7bPmEVD4hU-ChXxYw1OPycPHhJ8gp240UiTeEHaBvLD+Q@mail.gmail.com' \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).