diff options
author | Peter Stephenson <pws@users.sourceforge.net> | 2003-04-23 18:52:26 +0000 |
---|---|---|
committer | Peter Stephenson <pws@users.sourceforge.net> | 2003-04-23 18:52:26 +0000 |
commit | 06afb117d946290c467ce2adc664f3479ab7d149 (patch) | |
tree | 0b393db83c286ff46590f586778fef6a9496271d | |
parent | e127c8c462b3320ac0b78f867e2c6f183197ac72 (diff) | |
download | zsh-06afb117d946290c467ce2adc664f3479ab7d149.tar.gz zsh-06afb117d946290c467ce2adc664f3479ab7d149.tar.xz zsh-06afb117d946290c467ce2adc664f3479ab7d149.zip |
18477: Null pointer dereferenced in _arguments "*-+bar"
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Src/Zle/computil.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index d7265650c..823b5d5a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-04-23 Peter Stephenson <pws@pwstephenson.fsnet.co.uk> + * 18477: Src/Zle/computil.c: null pointer dereferenced with + _arguments '*-+bar'. + * IKEGAMI Tsutomu: SourceForge bug 722366: initialisation of pwd from PWD in environment didn't metafy. diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index fed165561..157a179af 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -910,7 +910,7 @@ parse_cadef(char *nam, char **args) opt->descr = NULL; } else opt->descr = NULL; - opt->xor = (again == 1 ? zarrdup(xor) : xor); + opt->xor = (again == 1 && xor ? zarrdup(xor) : xor); opt->type = otype; opt->args = oargs; opt->num = nopts++; |