1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-21 04:55:02 -05:00

Various uninitialised-variable accesses picked up by valgrind.

[originally from svn r3723]
This commit is contained in:
Simon Tatham 2004-01-17 14:25:36 +00:00
parent 6d7cc86470
commit 0f259c23ea
2 changed files with 23 additions and 18 deletions

View File

@ -850,6 +850,7 @@ static void scroll(Terminal *term, int topline, int botline, int lines, int sb)
*/ */
seltop = sb ? -term->savelines : topline; seltop = sb ? -term->savelines : topline;
if (term->selstate != NO_SELECTION) {
if (term->selstart.y >= seltop && if (term->selstart.y >= seltop &&
term->selstart.y <= botline) { term->selstart.y <= botline) {
term->selstart.y--; term->selstart.y--;
@ -865,13 +866,15 @@ static void scroll(Terminal *term, int topline, int botline, int lines, int sb)
term->selend.x = 0; term->selend.x = 0;
} }
} }
if (term->selanchor.y >= seltop && term->selanchor.y <= botline) { if (term->selanchor.y >= seltop &&
term->selanchor.y <= botline) {
term->selanchor.y--; term->selanchor.y--;
if (term->selanchor.y < seltop) { if (term->selanchor.y < seltop) {
term->selanchor.y = seltop; term->selanchor.y = seltop;
term->selanchor.x = 0; term->selanchor.x = 0;
} }
} }
}
lines--; lines--;
} }

View File

@ -152,6 +152,8 @@ static void dlg_init(struct dlgparam *dp)
dp->coloursel_result.ok = FALSE; dp->coloursel_result.ok = FALSE;
dp->treeitems = NULL; dp->treeitems = NULL;
dp->window = dp->cancelbutton = dp->currtreeitem = NULL; dp->window = dp->cancelbutton = dp->currtreeitem = NULL;
dp->flags = 0;
dp->currfocus = NULL;
} }
static void dlg_cleanup(struct dlgparam *dp) static void dlg_cleanup(struct dlgparam *dp)