[SCM] kodi-pvr-hts/master: Fix crash on initial predictive tuning

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 66b07a8a0f8aa7e65542a272fc1702e5d34e6269
Author: Norbert Federa <norbert.federa at gmail.com>
Date:   Tue Apr 19 10:06:02 2016 +0200

    Fix crash on initial predictive tuning

diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
index c0642a1..a8d1a03 100644
--- a/pvr.hts/addon.xml.in
+++ b/pvr.hts/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="3.2.2"
+  version="3.2.3"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
   <requires>
diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt
index 9487d4f..f5cfc50 100644
--- a/pvr.hts/changelog.txt
+++ b/pvr.hts/changelog.txt
@@ -1,3 +1,6 @@
+3.2.3
+- fixed: potential crash in the channel tuning predictor
+
 3.2.2
 - Updated to PVR API v5.1.1 (added: support for PVR_CONNECTION_STATE_CONNECTING)
 - fixed: potential crash in connection state change callback
diff --git a/src/tvheadend/ChannelTuningPredictor.cpp b/src/tvheadend/ChannelTuningPredictor.cpp
index cd0576b..3c83421 100644
--- a/src/tvheadend/ChannelTuningPredictor.cpp
+++ b/src/tvheadend/ChannelTuningPredictor.cpp
@@ -74,7 +74,7 @@ uint32_t ChannelTuningPredictor::PredictNextChannelId(uint32_t tuningFrom, uint3
    * it will point at the channel we should tune to */
   std::set<ChannelPair>::iterator predictedIt = m_channels.cend();
 
-  if (std::next(fromIt, 1) == toIt || toIt->second == firstNum) {
+  if (fromIt == m_channels.cend() || std::next(fromIt, 1) == toIt || toIt->second == firstNum) {
     /* Tuning up or if we're tuning the first channel */
     predictedIt = ++toIt;
   }

-- 
kodi-pvr-hts packaging