From dd30dacb5b5a22254125ca7b56adcfb7d3dbce77 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sat, 6 Feb 2021 12:52:19 +0100 Subject: [PATCH] fix crash caused by cVeDmDetailheaderRec::Parse introduced in 1.2.10 --- HISTORY | 5 +++-- coreengine/viewelementsdisplaymenu.c | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/HISTORY b/HISTORY index 5b884b7..aa71d55 100644 --- a/HISTORY +++ b/HISTORY @@ -462,14 +462,14 @@ Version 1.2.9 - [pbiering] added tokens for framesPerSecond and isHD - [pbiering] improve HD detection code, catch also stream content 9 -Version 1.2.10 +Version 1.2.10 (buggy) - [pbiering] added tokens for recordings: isUHD, isRadio - [pbiering] added token for channels: isUHD - [pbiering] expose to displaymenurecordings: recchannelname, recchannelid - [pbiering] retrieve ChannelName from 'info' and fallback via ChannelID from active channel list - [kamel5] Update skin estuary4vdr -Version 1.2.11 +Version 1.2.11 (buggy) - [pbiering] align displayed tuner number (0,1,2 -> 1,2,3) - [pbiering] SVDRP: do not reload in case plugin is not fully initialized (results in VDR crash) - [pbiering] SVDRP: respond with proper error message in case of OSD is active or parsing error @@ -477,3 +477,4 @@ Version 1.2.11 Version 1.2.12 - [pbiering] added token for recordings: isRecording +- [pbiering] fix crash caused by cVeDmDetailheaderRec::Parse introduced in 1.2.10 diff --git a/coreengine/viewelementsdisplaymenu.c b/coreengine/viewelementsdisplaymenu.c index 499c717..972e4f3 100644 --- a/coreengine/viewelementsdisplaymenu.c +++ b/coreengine/viewelementsdisplaymenu.c @@ -1223,9 +1223,9 @@ bool cVeDmDetailheaderRec::Parse(bool forced) { } if (info->ChannelName() && (strlen(info->ChannelName()) > 0)) { - tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelname, info->ChannelName()); - tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelid, info->ChannelID().ToString()); - tokenContainer->AddIntToken((int)eDmDetailedRecIT::recchannelnumber, 0); // cannot be provided, for backward compatibility only + tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelname, info->ChannelName()); + tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelid, info->ChannelID().ToString()); + tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::recchannelnumber, 0); // cannot be provided, for backward compatibility only } else { #if defined (APIVERSNUM) && (APIVERSNUM >= 20301) LOCK_CHANNELS_READ; @@ -1234,9 +1234,9 @@ bool cVeDmDetailheaderRec::Parse(bool forced) { const cChannel *channel = Channels.GetByChannelID(info->ChannelID()); #endif if (channel) { - tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelname, channel->Name()); - tokenContainer->AddStringToken((int)eDmDetailedRecST::recchannelid, *channel->GetChannelID().ToString()); - tokenContainer->AddIntToken((int)eDmDetailedRecIT::recchannelnumber, channel->Number()); + tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelname, channel->Name()); + tokenContainer->AddStringToken((int)eDmDetailedHeaderRecST::recchannelid, *channel->GetChannelID().ToString()); + tokenContainer->AddIntToken((int)eDmDetailedHeaderRecIT::recchannelnumber, channel->Number()); } } }