fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid segfault in getstr_fixscr()

Browse Source 
Avoid a segfault that may occur if getstr_fixscr() changes the scroll
offset to something outside the input boundaries (e.g. if a word that is
only partly visible is killed via backward-kill-word).

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-06-08 16:46:24 +02:00
parent e85501e5ef
commit 33ce6cd8f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/getstring.c
View File

@ -154,7 +154,7 @@ getstr_fixscr (struct getstr_status *st)
while (st->pos < st->scrpos) while (st->pos < st->scrpos)
{ {
pgskip = 0; pgskip = 0;
while (pgskip < pgsize) while (pgskip < pgsize && st->scrpos > 0)
{ {
st->scrpos--; st->scrpos--;
pgskip += st->ci[st->scrpos + 1].dpyoff - st->ci[st->scrpos].dpyoff; pgskip += st->ci[st->scrpos + 1].dpyoff - st->ci[st->scrpos].dpyoff;
@ -163,7 +163,7 @@ getstr_fixscr (struct getstr_status *st)
while (st->ci[st->pos].dpyoff - st->ci[st->scrpos].dpyoff > col - 2) while (st->ci[st->pos].dpyoff - st->ci[st->scrpos].dpyoff > col - 2)
{ {
pgskip = 0; pgskip = 0;
while (pgskip < pgsize) while (pgskip < pgsize && st->scrpos < st->len)
{ {
pgskip += st->ci[st->scrpos + 1].dpyoff - st->ci[st->scrpos].dpyoff; pgskip += st->ci[st->scrpos + 1].dpyoff - st->ci[st->scrpos].dpyoff;
st->scrpos++; st->scrpos++;