frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a crash in case the bottom text of a CAM menu is empty

Browse Source
This commit is contained in:
Klaus Schmidinger
2017-05-17 09:17:44 +02:00
parent ce42e42ed7
commit 50211c706a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@@ -8991,7 +8991,7 @@ Video Disk Recorder Revision History
current channel is listed. current channel is listed.
- Fixed a possible crash when pulling the CAM while decrypting a channel with MTD. - Fixed a possible crash when pulling the CAM while decrypting a channel with MTD.
2017-05-12: Version 2.3.5 2017-05-17: Version 2.3.5
- CAMs are now sent a generated EIT packet that contains a single 'present event' for - CAMs are now sent a generated EIT packet that contains a single 'present event' for
the current SID, in order to avoid any parental rating dialogs. the current SID, in order to avoid any parental rating dialogs.
@@ -9024,3 +9024,4 @@ Video Disk Recorder Revision History
- Fixed handling line numbers in error messages when reading EPG data. - Fixed handling line numbers in error messages when reading EPG data.
- Added handling RI_HOST_CONTROL to the CI protocol (no actual processing, but its - Added handling RI_HOST_CONTROL to the CI protocol (no actual processing, but its
presence is required by some CAMs). presence is required by some CAMs).
- Fixed a crash in case the bottom text of a CAM menu is empty.

6
menu.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 4.26 2017/05/01 13:01:00 kls Exp $ * $Id: menu.c 4.27 2017/05/17 09:15:51 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@@ -2243,7 +2243,7 @@ void cMenuCam::Set(void)
SetHasHotkeys(ciMenu->Selectable()); SetHasHotkeys(ciMenu->Selectable());
GenerateTitle(ciMenu->TitleText()); GenerateTitle(ciMenu->TitleText());
dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->TitleText()); dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->TitleText());
if (*ciMenu->SubTitleText()) { if (!isempty(ciMenu->SubTitleText())) {
dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->SubTitleText()); dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->SubTitleText());
AddMultiLineItem(ciMenu->SubTitleText()); AddMultiLineItem(ciMenu->SubTitleText());
offset = Count(); offset = Count();
@@ -2252,7 +2252,7 @@ void cMenuCam::Set(void)
Add(new cOsdItem(hk(ciMenu->Entry(i)), osUnknown, ciMenu->Selectable())); Add(new cOsdItem(hk(ciMenu->Entry(i)), osUnknown, ciMenu->Selectable()));
dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->Entry(i)); dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->Entry(i));
} }
if (*ciMenu->BottomText()) { if (!isempty(ciMenu->BottomText())) {
AddMultiLineItem(ciMenu->BottomText()); AddMultiLineItem(ciMenu->BottomText());
dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->BottomText()); dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->BottomText());
} }