LCDProcClient: Fix two array bounds read errors

Refs #11379
MythTV · Jul 13, 2013 · 447097d · 447097d
1 parent 9039d5f
commit 447097d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/mythtv/programs/mythlcdserver/lcdprocclient.cpp b/mythtv/programs/mythlcdserver/lcdprocclient.cpp
@@ -1628,7 +1628,7 @@ void LCDProcClient::scrollMenuText()
 
     // Back up one if were at the end so the last item shows up at the bottom
     // of the display
-    if ((int)counter == m_lcdMenuItems->size())
+    if (counter > 1 && (int)counter == m_lcdMenuItems->size())
         --it;
 
     bool stopTimer = true;
@@ -1990,6 +1990,9 @@ void LCDProcClient::outputRecStatus(void)
         listTime = LCD_RECSTATUS_TIME;
         m_isTimeVisible = false;
         m_activeScreen = "RecStatus";
+
+        if (m_lcdTunerNo > (int) m_tunerList.size() - 1)
+            m_lcdTunerNo = 0;
     }
     else if ( m_lcdTunerNo > (int) m_tunerList.size() - 1)
     {