mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-22 16:20:23 +02:00
Code Releases Activity

25611, 25613: protect against two possible NULL dereferences.

Browse source
This commit is contained in:
Clint Adams 2008-09-05 00:24:27 +00:00
parent 29680850a0
commit 13f60efbd7
2 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2008-09-04 Clint Adams <clint@zsh.org>
* 25611, 25613: Src/Modules/curses.c: protect against two possible
NULL dereferences.
* 25612: Src/Zle/compmatch.c: remove dead code.
* 25610: Src/hist.c: remove dead code.

40
Src/Modules/curses.c
View file

@ -874,16 +874,17 @@ zccmd_attr(const char *nam, char **args)
if ((zca = zcurses_attrget(w->win, ptr)) == NULL) {
zwarnnam(nam, "attribute `%s' not known", ptr);
ret = 1;
}
switch(onoff) {
case ZCURSES_ATTRON:
if (wattron(w->win, zca->number) == ERR)
ret = 1;
break;
case ZCURSES_ATTROFF:
if (wattroff(w->win, zca->number) == ERR)
ret = 1;
break;
} else {
switch(onoff) {
case ZCURSES_ATTRON:
if (wattron(w->win, zca->number) == ERR)
ret = 1;
break;
case ZCURSES_ATTROFF:
if (wattroff(w->win, zca->number) == ERR)
ret = 1;
break;
}
}
}
}
@ -948,14 +949,17 @@ zccmd_bg(const char *nam, char **args)
if ((zca = zcurses_attrget(w->win, ptr)) == NULL) {
zwarnnam(nam, "attribute `%s' not known", ptr);
ret = 1;
}
switch(onoff) {
case ZCURSES_ATTRON:
ch |= zca->number;
break;
case ZCURSES_ATTROFF:
ch &= ~zca->number;
break;
} else {
switch(onoff) {
case ZCURSES_ATTRON:
if (wattron(w->win, zca->number) == ERR)
ret = 1;
break;
case ZCURSES_ATTROFF:
if (wattroff(w->win, zca->number) == ERR)
ret = 1;
break;
}
}
}
}