frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Channel IDs are now checked when reading 'channels.conf' to avoid later problems with timers

Browse Source
This commit is contained in:
Klaus Schmidinger 2003-10-17 15:42:40 +02:00
parent d5c46a4ad5
commit f1a4d067be
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -2431,3 +2431,5 @@ Video Disk Recorder Revision History
new VDR installations. new VDR installations.
- Edited recordings will now never be deleted automatically if the disk runs - Edited recordings will now never be deleted automatically if the disk runs
full (suggested by Emil Naepflein). full (suggested by Emil Naepflein).
- Channel IDs are now checked when reading 'channels.conf' to avoid later
problems with timers.

6
channels.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: channels.c 1.15 2003/10/03 15:12:59 kls Exp $ * $Id: channels.c 1.16 2003/10/17 15:42:40 kls Exp $
*/ */
#include "channels.h" #include "channels.h"
@ -369,6 +369,10 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID)
free(vpidbuf); free(vpidbuf);
free(apidbuf); free(apidbuf);
free(namebuf); free(namebuf);
if (!GetChannelID().Valid()) {
esyslog("ERROR: channel data results in invalid ID!");
return false;
}
if (!AllowNonUniqueID && Channels.GetByChannelID(GetChannelID())) { if (!AllowNonUniqueID && Channels.GetByChannelID(GetChannelID())) {
esyslog("ERROR: channel data not unique!"); esyslog("ERROR: channel data not unique!");
return false; return false;