From 77bbd6873072fb1f9f390422b07de3baba5362c2 Mon Sep 17 00:00:00 2001
From: Ross Nicholson <phunkyfish@gmail.com>
Date: Sun, 18 Aug 2019 20:37:25 +0100
Subject: [PATCH 1/2] Fix nullptr initialisation

---
 src/PVRIptvData.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PVRIptvData.cpp b/src/PVRIptvData.cpp
index 7d8510243..637121da9 100644
--- 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;

From 42ef255f8ffd057c1019b213f575b0536f41dffd Mon Sep 17 00:00:00 2001
From: Ross Nicholson <phunkyfish@gmail.com>
Date: Sun, 18 Aug 2019 20:53:22 +0100
Subject: [PATCH 2/2] changelog and version

---
 pvr.iptvsimple/addon.xml.in  | 2 +-
 pvr.iptvsimple/changelog.txt | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pvr.iptvsimple/addon.xml.in b/pvr.iptvsimple/addon.xml.in
index ffda48269..baf23a4c2 100644
--- 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
index 46f440457..b03eefbb7 100644
--- 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