Merge pull request #508 from SpiritsUnite/back-button

Drewol · web-flow · commit bcc18995efef · 2021-09-08T21:43:28.000+02:00
Fix out of bounds access on back button input
diff --git a/Main/src/Input.cpp b/Main/src/Input.cpp
@@ -400,7 +400,7 @@ void Input::m_OnButtonInput(Button b, bool pressed)
 	}
 
 	static Timer t;
-	if(b >= Button::LS_0Neg)
+	if(b >= Button::LS_0Neg && b <= Button::LS_1Pos)
 	{
 		int32 btnIdx = (int32)b - (int32)Button::LS_0Neg;
 		int32 laserIdx = btnIdx / 2;

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ void Input::m_OnButtonInput(Button b, bool pressed)`
`400`	`400`	`}`
`401`	`401`
`402`	`402`	`static Timer t;`
`403`		`- if(b >= Button::LS_0Neg)`
	`403`	`+ if(b >= Button::LS_0Neg && b <= Button::LS_1Pos)`
`404`	`404`	`{`
`405`	`405`	`int32 btnIdx = (int32)b - (int32)Button::LS_0Neg;`
`406`	`406`	`int32 laserIdx = btnIdx / 2;`