diff options
| author | Peter Stephenson <pws@zsh.org> | 2016-01-25 15:43:06 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2016-01-25 15:43:06 +0000 |
| commit | be32864e6ff6a872d63314b4baedbfbf2eed54bd (patch) | |
| tree | 11678df935451381fb8e10f16ad865a83d4bdc88 | |
| parent | 3c9185272d1af21cd976a548f932d7554a3bb533 (diff) | |
| download | zsh-be32864e6ff6a872d63314b4baedbfbf2eed54bd.tar.gz zsh-be32864e6ff6a872d63314b4baedbfbf2eed54bd.tar.xz zsh-be32864e6ff6a872d63314b4baedbfbf2eed54bd.zip | |
37776: Set errflag before calls to zwarning().
This avoids an attempt to call zerr() or zerrnam() recusrively.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/utils.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 5cb338f08..4a8077ab4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-01-25 Peter Stephenson <p.stephenson@samsung.com> + + * 37776: Src/utils.c: set errflag before calling zwarning() to + avoid recursive error messages. + 2016-01-23 Matthew Martin <phy1729@gmail.com> * 37725: Completion/Unix/Command/_init_d: Completion: _init_d: diff --git a/Src/utils.c b/Src/utils.c index fd0bab320..17ebfebf9 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -169,12 +169,12 @@ VA_DCL errflag |= ERRFLAG_ERROR; return; } + errflag |= ERRFLAG_ERROR; VA_START(ap, fmt); VA_GET_ARG(ap, fmt, const char *); zwarning(NULL, fmt, ap); va_end(ap); - errflag |= ERRFLAG_ERROR; } /**/ @@ -188,13 +188,13 @@ VA_DCL if (errflag || noerrs) return; + errflag |= ERRFLAG_ERROR; VA_START(ap, fmt); VA_GET_ARG(ap, cmd, const char *); VA_GET_ARG(ap, fmt, const char *); zwarning(cmd, fmt, ap); va_end(ap); - errflag |= ERRFLAG_ERROR; } /**/ |