Fix uninitialized memory access in toolbar.

bcmpinc · whitequark · commit 9d1601eea903 · 2019-02-19T11:35:56.000Z
diff --git a/src/graphicswin.cpp b/src/graphicswin.cpp
@@ -390,6 +390,7 @@ void GraphicsWindow::Init() {
 
     showSnapGrid = false;
     context.active = false;
+    toolbarHovered = Command::NONE;
 
     if(!window) {
         window = Platform::CreateWindow();
diff --git a/src/toolbar.cpp b/src/toolbar.cpp
@@ -154,6 +154,9 @@ bool GraphicsWindow::ToolbarDrawOrHitTest(int mx, int my,
 
     bool withinToolbar =
         (mx >= aleft && mx <= aright && my <= atop && my >= abot);
+    
+    // Initialize/clear menuHit.
+    if(menuHit) *menuHit = Command::NONE;
 
     if(!canvas && !withinToolbar) {
         // This gets called every MouseMove event, so return quickly.
@@ -224,9 +227,5 @@ bool GraphicsWindow::ToolbarDrawOrHitTest(int mx, int my,
         }
     }
 
-    if(!withinToolbar) {
-        if(menuHit) *menuHit = Command::NONE;
-    }
-
     return withinToolbar;
 }

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,9 @@ bool GraphicsWindow::ToolbarDrawOrHitTest(int mx, int my,`
`154`	`154`
`155`	`155`	`bool withinToolbar =`
`156`	`156`	`(mx >= aleft && mx <= aright && my <= atop && my >= abot);`
	`157`	`+`
	`158`	`+ // Initialize/clear menuHit.`
	`159`	`+ if(menuHit) *menuHit = Command::NONE;`
`157`	`160`
`158`	`161`	`if(!canvas && !withinToolbar) {`
`159`	`162`	`// This gets called every MouseMove event, so return quickly.`
`@@ -224,9 +227,5 @@ bool GraphicsWindow::ToolbarDrawOrHitTest(int mx, int my,`
`224`	`227`	`}`
`225`	`228`	`}`
`226`	`229`
`227`		`- if(!withinToolbar) {`
`228`		`- if(menuHit) *menuHit = Command::NONE;`
`229`		`- }`
`230`		`-`
`231`	`230`	`return withinToolbar;`
`232`	`231`	`}`