aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Sommerfeld <kai.sommerfeld@gmx.com>2018-10-17 13:56:09 +0200
committerGitHub <noreply@github.com>2018-10-17 13:56:09 +0200
commit4b232a9fb0bd4787c944e64211ad683f7113c1bc (patch)
tree56936a97414788923568f1980c10b7ab7ec9a23e
parentdc33111dc23d00372e48779ddf95a8c8cb1c4ffc (diff)
parent8c7e0b534de0f0eb5dfc41f4206f26f512ddee26 (diff)
Merge pull request #14636 from ksooo/CID188792
[PVR] Fix CID 188792: Memory - illegal accesses (WRAPPER_ESCAPE).
-rw-r--r--xbmc/addons/PVRClient.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/xbmc/addons/PVRClient.cpp b/xbmc/addons/PVRClient.cpp
index 0fb2e643d5..434382bff0 100644
--- a/xbmc/addons/PVRClient.cpp
+++ b/xbmc/addons/PVRClient.cpp
@@ -656,7 +656,8 @@ public:
m_strIMDBNumber(kodiTag->IMDBNumber()),
m_strEpisodeName(kodiTag->EpisodeName(true)),
m_strIconPath(kodiTag->Icon()),
- m_strSeriesLink(kodiTag->SeriesLink())
+ m_strSeriesLink(kodiTag->SeriesLink()),
+ m_strGenreDescription(kodiTag->GetGenresLabel())
{
time_t t;
kodiTag->StartAsUTC().GetAsTime(t);
@@ -688,7 +689,7 @@ public:
strEpisodeName = m_strEpisodeName.c_str();
strIconPath = m_strIconPath.c_str();
strSeriesLink = m_strSeriesLink.c_str();
- strGenreDescription = kodiTag->GetGenresLabel().c_str();
+ strGenreDescription = m_strGenreDescription.c_str();
}
virtual ~CAddonEpgTag() = default;
@@ -705,6 +706,7 @@ private:
std::string m_strEpisodeName;
std::string m_strIconPath;
std::string m_strSeriesLink;
+ std::string m_strGenreDescription;
};
PVR_ERROR CPVRClient::IsRecordable(const CConstPVREpgInfoTagPtr &tag, bool &bIsRecordable) const