mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-20 06:56:05 +02:00
Code

41078: Empty psvar could cause bad dereference in prompt expansion

This commit is contained in:
Peter Stephenson 2017-05-09 09:46:23 +01:00
parent 51eff6168e
commit 263a0c2476
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2017-05-09 Peter Stephenson <p.stephenson@samsung.com>
* 41078: Src/prompt.c, Test/D01prompt.ztst: Empty psvar could
cause bad reference in prompt expansion.
2017-05-08 Peter Stephenson <p.stephenson@samsung.com>
* 41059: Completion/compinit: use 2>&- to avoid error in

2
Src/prompt.c
View File

@ -399,7 +399,7 @@ putpromptchar(int doprint, int endchar, unsigned int *txtchangep)
test = 1;
break;
case 'V':
if (arrlen_ge(psvar, arg)) {
if (psvar && *psvar && arrlen_ge(psvar, arg)) {
if (*psvar[(arg ? arg : 1) - 1])
test = 1;
}

4
Test/D01prompt.ztst
View File

@ -209,3 +209,7 @@
print -P -f '%%Sfoo%%s\n' bar
0:print -P -f
>%Sfoo%s
print ${(%U)Y-%(v}
0:Regression test for test on empty psvar
>