]> asedeno.scripts.mit.edu Git - PuTTY.git/commitdiff
Various uninitialised-variable accesses picked up by valgrind.
authorSimon Tatham <anakin@pobox.com>
Sat, 17 Jan 2004 14:25:36 +0000 (14:25 +0000)
committerSimon Tatham <anakin@pobox.com>
Sat, 17 Jan 2004 14:25:36 +0000 (14:25 +0000)
[originally from svn r3723]

terminal.c
unix/gtkdlg.c

index 1fa66e12734b0f8466a8e4dd60d78ab3470d3226..cb00ea6e7a475f19a3ab3d91ae79c8292127a687 100644 (file)
@@ -850,26 +850,29 @@ static void scroll(Terminal *term, int topline, int botline, int lines, int sb)
             */
            seltop = sb ? -term->savelines : topline;
 
-           if (term->selstart.y >= seltop &&
-               term->selstart.y <= botline) {
-               term->selstart.y--;
-               if (term->selstart.y < seltop) {
-                   term->selstart.y = seltop;
-                   term->selstart.x = 0;
+           if (term->selstate != NO_SELECTION) {
+               if (term->selstart.y >= seltop &&
+                   term->selstart.y <= botline) {
+                   term->selstart.y--;
+                   if (term->selstart.y < seltop) {
+                       term->selstart.y = seltop;
+                       term->selstart.x = 0;
+                   }
                }
-           }
-           if (term->selend.y >= seltop && term->selend.y <= botline) {
-               term->selend.y--;
-               if (term->selend.y < seltop) {
-                   term->selend.y = seltop;
-                   term->selend.x = 0;
+               if (term->selend.y >= seltop && term->selend.y <= botline) {
+                   term->selend.y--;
+                   if (term->selend.y < seltop) {
+                       term->selend.y = seltop;
+                       term->selend.x = 0;
+                   }
                }
-           }
-           if (term->selanchor.y >= seltop && term->selanchor.y <= botline) {
-               term->selanchor.y--;
-               if (term->selanchor.y < seltop) {
-                   term->selanchor.y = seltop;
-                   term->selanchor.x = 0;
+               if (term->selanchor.y >= seltop &&
+                   term->selanchor.y <= botline) {
+                   term->selanchor.y--;
+                   if (term->selanchor.y < seltop) {
+                       term->selanchor.y = seltop;
+                       term->selanchor.x = 0;
+                   }
                }
            }
 
index 4ca8457357b88a36a102561143ff7115464dace3..7e30adbe3cf3dfe7083619e6c6b3378589077545 100644 (file)
@@ -152,6 +152,8 @@ static void dlg_init(struct dlgparam *dp)
     dp->coloursel_result.ok = FALSE;
     dp->treeitems = NULL;
     dp->window = dp->cancelbutton = dp->currtreeitem = NULL;
+    dp->flags = 0;
+    dp->currfocus = NULL;
 }
 
 static void dlg_cleanup(struct dlgparam *dp)