From 0803609fd234cadc36ac75763aa00a71160a633d Mon Sep 17 00:00:00 2001
From: Mgamerz <Mgamerz2@gmail.com>
Date: Sun, 6 Sep 2020 12:09:30 -0600
Subject: [PATCH] Fix MoveUp and MoveDown to prevent exception

When calling MoveUp and MoveDown, the 'selected' variable is not checked. If I am using a backing data source that can change, this selected value +/- 1 may still not lie in the valid range of values. This PR checks and changes the following:

1) If moving up, and the CURRENT selected value is >= backing data length, the last item is selected
2) If moving down, and the CURRENT selected value is >= backing data length, the last item is selected
3) If the items list has no items, the methods return false as there is nothing to move to. I'm not sure if we should set lastSelectedItem to -1 in this instance.
---
 Terminal.Gui/Views/ListView.cs | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/Terminal.Gui/Views/ListView.cs b/Terminal.Gui/Views/ListView.cs
index ec8c52b30..93a0d76b0 100644
--- a/Terminal.Gui/Views/ListView.cs
+++ b/Terminal.Gui/Views/ListView.cs
@@ -1,4 +1,4 @@
-//
+//
 // ListView.cs: ListView control
 //
 // Authors:
@@ -448,8 +448,20 @@ namespace Terminal.Gui {
 		/// <returns></returns>
 		public virtual bool MoveDown ()
 		{
-			if (selected + 1 < source.Count) {
+			if (source.Count == 0){
+				// Do we set lastSelectedItem to zero here?
+                return false; //Nothing for us to move to
+            }
+			if (selected >= source.Count) { 
+				// If for some reason we are currently outside of the
+				// valid values range, we should select the bottommost valid value.
+				// This can occur if the backing data source changes.
+                selected = source.Count - 1;
+				OnSelectedChanged ();
+				SetNeedsDisplay ();
+            } else if (selected + 1 < source.Count) { //can move by down by one.
 				selected++;
+
 				if (selected >= top + Frame.Height)
 					top++;
 				OnSelectedChanged ();
@@ -468,8 +480,22 @@ namespace Terminal.Gui {
 		/// <returns></returns>
 		public virtual bool MoveUp ()
 		{
-			if (selected > 0) {
+			if (source.Count == 0){
+				// Do we set lastSelectedItem to zero here?
+                return false; //Nothing for us to move to
+            }
+			if (selected >= source.Count) { 
+				// If for some reason we are currently outside of the
+				// valid values range, we should select the bottommost valid value.
+				// This can occur if the backing data source changes.
+                selected = source.Count - 1;
+				OnSelectedChanged ();
+				SetNeedsDisplay ();
+            } else if (selected > 0) {
 				selected--;
+				if (selected > Source.Count) {
+                    selected = Source.Count - 1;
+                }
 				if (selected < top)
 					top = selected;
 				OnSelectedChanged ();