From e349523ec21d04756bb1c5ef606fe54e5130524c Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Tue, 4 Mar 2025 15:54:07 +0100 Subject: [PATCH] Making absolutely sure cEvent::Title() never returns NULL --- HISTORY | 4 +++- config.h | 6 +++--- epg.h | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/HISTORY b/HISTORY index 866b41c9..c0de021a 100644 --- a/HISTORY +++ b/HISTORY @@ -10090,7 +10090,7 @@ Video Disk Recorder Revision History - Added missing locks to SetMenuItem() functions. - Revised locking in cMenuSchedule and cMenuWhatsOn. -2025-03-03: +2025-03-04: - Added the "override" keyword to virtual functions reimplemented in derived classes. Plugins may want to do the same, but don't have to. @@ -10102,3 +10102,5 @@ Video Disk Recorder Revision History used to get full access to the timer (if any) defined for this event. - Added a mutex lock to protect creating/deleting cStatus objects (suggested by Markus Ehrnsperger). +- Making absolutely sure cEvent::Title() never returns NULL. + APIVERSNUM is now 30007. diff --git a/config.h b/config.h index 0166f485..9bf8af66 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 5.27 2025/03/02 11:03:35 kls Exp $ + * $Id: config.h 5.28 2025/03/04 15:54:07 kls Exp $ */ #ifndef __CONFIG_H @@ -27,8 +27,8 @@ // The plugin API's version number: -#define APIVERSION "6" -#define APIVERSNUM 30006 +#define APIVERSION "7" +#define APIVERSNUM 30007 // When loading plugins, VDR searches files by their APIVERSION, which // is different from VDRVERSION. APIVERSION is a plain number, incremented diff --git a/epg.h b/epg.h index 6ee6f417..5519f7a9 100644 --- a/epg.h +++ b/epg.h @@ -7,7 +7,7 @@ * Original version (as used in VDR before 1.3.0) written by * Robert Schneider and Rolf Hakenes . * - * $Id: epg.h 5.9 2025/03/02 11:03:35 kls Exp $ + * $Id: epg.h 5.10 2025/03/04 15:54:07 kls Exp $ */ #ifndef __EPG_H @@ -102,7 +102,7 @@ public: uchar TableID(void) const { return tableID; } uchar Version(void) const { return version; } int RunningStatus(void) const { return runningStatus; } - const char *Title(void) const { return title; } + const char *Title(void) const { return title ? title : ""; } const char *ShortText(void) const { return shortText; } const char *Description(void) const { return description; } const cComponents *Components(void) const { return components; }