Merge pull request #265 from phunkyfish/initialise-pointer-fix

Fix nullptr initialisation
kodi-pvr · Aug 18, 2019 · cf64ac7 · cf64ac7
2 parents 53d179c + 42ef255
commit cf64ac7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pvr.iptvsimple/addon.xml.in b/pvr.iptvsimple/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.iptvsimple"
-  version="4.2.0"
+  version="4.2.1"
   name="PVR IPTV Simple Client"
   provider-name="nightik">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.iptvsimple/changelog.txt b/pvr.iptvsimple/changelog.txt
@@ -1,3 +1,6 @@
+v4.2.1
+- Fix nullptr initialisation
+
 v4.2.0
 - Add support for sub-title/actor/director/writer in XML
 

diff --git a/src/PVRIptvData.cpp b/src/PVRIptvData.cpp
@@ -250,7 +250,7 @@ bool PVRIptvData::LoadEPG(time_t iStart, time_t iEnd)
     m_epg.clear();
 
   int iBroadCastId = 0;
-  xml_node<>* pChannelNode;
+  xml_node<>* pChannelNode = nullptr;
   for (pChannelNode = pRootElement->first_node("channel"); pChannelNode; pChannelNode = pChannelNode->next_sibling("channel"))
   {
     std::string strName;
@@ -296,7 +296,7 @@ bool PVRIptvData::LoadEPG(time_t iStart, time_t iEnd)
     }
   }
 
-  PVRIptvEpgChannel* epg;
+  PVRIptvEpgChannel* epg = nullptr;
   for (pChannelNode = pRootElement->first_node("programme"); pChannelNode; pChannelNode = pChannelNode->next_sibling("programme"))
   {
     std::string strId;