diff options
| author | Joey Pabalinas <joeypabalinas@gmail.com> | 2018-01-23 22:28:08 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2018-01-23 22:28:08 -0800 |
| commit | 110b13e1090bc31ac1352b28adc2d02b6d25a102 (patch) | |
| tree | c62d4fbe3974a8b1a914e8fd8e440db2151bd6cf | |
| parent | 47430bcd7cb2fade4d8753d920a2720eeca52f6a (diff) | |
| download | zsh-110b13e1090bc31ac1352b28adc2d02b6d25a102.tar.gz zsh-110b13e1090bc31ac1352b28adc2d02b6d25a102.tar.xz zsh-110b13e1090bc31ac1352b28adc2d02b6d25a102.zip | |
42313: avoid null-pointer deref when using ${(PA)...} on an empty array result
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/subst.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index d2ba94afc..3037edda4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-01-23 Barton E. Schaefer <schaefer@zsh.org> + + * Joey Pabalinas: 42313: Src/subst.c: avoid null-pointer deref + when using ${(PA)...} on an empty array result + 2018-01-23 Oliver Kiddle <okiddle@yahoo.co.uk> * 42317: Completion/Linux/Command/_cryptsetup, diff --git a/Src/subst.c b/Src/subst.c index d027e3d83..a265a187e 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -2430,7 +2430,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags, val = aval[0]; isarr = 0; } - s = dyncat(val, s); + s = val ? dyncat(val, s) : dupstring(s); /* Now behave po-faced as if it was always like that... */ subexp = 0; /* |