Fix off-by-one errors

xbmc · Sep 6, 2012 · fcf21ea · fcf21ea
1 parent 6e6790a
commit fcf21ea
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp
@@ -310,7 +310,7 @@ unsigned int CAEStreamInfo::SyncAC3(uint8_t *data, unsigned int size)
     else
       lfeon = ((data[6] >> pos) & 0x1) ? 1 : 0;
 
-    if (bsid > 0x11 || acmod > 8)
+    if (bsid > 0x11 || acmod > 7)
       continue;
 
     if (bsid <= 10)

diff --git a/xbmc/input/TouchInput.cpp b/xbmc/input/TouchInput.cpp
@@ -286,7 +286,7 @@ bool CTouchInput::Handle(TouchEvent event, float x, float y, int64_t time, int32
 
 bool CTouchInput::Update(int32_t pointer, float x, float y, int64_t time, float size /* = 0.0f */)
 {
-  if (pointer < 0 || pointer > TOUCH_MAX_POINTERS)
+  if (pointer < 0 || pointer >= TOUCH_MAX_POINTERS)
     return false;
 
   CSingleLock lock(m_critical);

diff --git a/xbmc/music/karaoke/karaokelyricstext.cpp b/xbmc/music/karaoke/karaokelyricstext.cpp
@@ -70,7 +70,7 @@ CKaraokeLyricsText::CKaraokeLyricsText()
   m_karaokeFont = 0;
 
   int coloridx = g_guiSettings.GetInt("karaoke.fontcolors");
-  if ( coloridx < KARAOKE_COLOR_START || coloridx > KARAOKE_COLOR_END )
+  if ( coloridx < KARAOKE_COLOR_START || coloridx >= KARAOKE_COLOR_END )
     coloridx = 0;
 
   m_colorLyrics = gLyricColors[coloridx].text;

diff --git a/xbmc/pictures/SlideShowPicture.cpp b/xbmc/pictures/SlideShowPicture.cpp
@@ -247,10 +247,12 @@ void CSlideShowPic::Process(unsigned int currentTime, CDirtyRegionList &dirtyreg
           int i;
           for (i = 0; i < 10; i++)
           {
-            if (fabs(m_fZoomAmount - zoomamount[i]) < 0.01 * zoomamount[i])
+            if (fabs(m_fZoomAmount - zoomamount[i]) < 0.01*zoomamount[i])
+            {
+              m_fZoomAmount = zoomamount[i];
               break;
+            }
           }
-          m_fZoomAmount = zoomamount[i];
           m_bNoEffect = (m_fZoomAmount != 1.0f); // turn effect rendering back on.
         }
         /* not really needed anymore as we support arbitrary rotations

diff --git a/xbmc/windows/GUIWindowFileManager.cpp b/xbmc/windows/GUIWindowFileManager.cpp
@@ -545,7 +545,7 @@ bool CGUIWindowFileManager::Update(int iList, const CStdString &strDirectory)
 
 void CGUIWindowFileManager::OnClick(int iList, int iItem)
 {
-  if ( iList < 0 || iList > 2) return ;
+  if ( iList < 0 || iList >= 2) return ;
   if ( iItem < 0 || iItem >= m_vecItems[iList]->Size() ) return ;
 
   CFileItemPtr pItem = m_vecItems[iList]->Get(iItem);
@@ -964,7 +964,7 @@ int CGUIWindowFileManager::GetFocusedList() const
 
 void CGUIWindowFileManager::OnPopupMenu(int list, int item, bool bContextDriven /* = true */)
 {
-  if (list < 0 || list > 2) return ;
+  if (list < 0 || list >= 2) return ;
   bool bDeselect = SelectItem(list, item);
   // calculate the position for our menu
   float posX = 200;