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

Limited the line length in the EPG bugfix report

Browse Source
This commit is contained in:
Klaus Schmidinger 2004-01-04 15:20:42 +01:00
parent f192a51002
commit a80709f1dd
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -2534,3 +2534,6 @@ Video Disk Recorder Revision History
provided by the installed CAM. Only the special values 1-16 are used to assign provided by the installed CAM. Only the special values 1-16 are used to assign
a channel to a particular device. a channel to a particular device.
- Increased the maximum number of possible OSD colors to 256. - Increased the maximum number of possible OSD colors to 256.
- Limited the line length in the EPG bugfix report, which appears to fix a buffer
overflow that caused a crash when cleaning up the EPG data (at 05:00 in the
morning).

16
epg.c
View File

@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by * Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* *
* $Id: epg.c 1.2 2003/12/25 12:47:26 kls Exp $ * $Id: epg.c 1.3 2004/01/04 15:20:42 kls Exp $
*/ */
#include "epg.h" #include "epg.h"
@ -233,6 +233,10 @@ void ReportEpgBugFixStats(bool Reset)
} }
q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->Name()); q += snprintf(q, sizeof(buffer) - (q - buffer), "%s%s", delim, channel->Name());
delim = ", "; delim = ", ";
if (q - buffer > 80) {
q += snprintf(q, sizeof(buffer) - (q - buffer), "%s...", delim);
break;
}
} }
} }
if (*buffer) if (*buffer)
@ -261,7 +265,7 @@ void cEvent::FixEpgBugs(void)
// EPG data. Let's fix their bugs as good as we can: // EPG data. Let's fix their bugs as good as we can:
if (title) { if (title) {
// VOX puts too much information into the ShortText and leaves the // Some channels put too much information into the ShortText and leave the
// Description empty: // Description empty:
// //
// Title // Title
@ -287,7 +291,7 @@ void cEvent::FixEpgBugs(void)
} }
} }
// VOX and VIVA put the ShortText in quotes and use either the ShortText // Some channels put the ShortText in quotes and use either the ShortText
// or the Description field, depending on how long the string is: // or the Description field, depending on how long the string is:
// //
// Title // Title
@ -311,7 +315,7 @@ void cEvent::FixEpgBugs(void)
} }
} }
// VOX and VIVA put the Description into the ShortText (preceeded // Some channels put the Description into the ShortText (preceeded
// by a blank) if there is no actual ShortText and the Description // by a blank) if there is no actual ShortText and the Description
// is short enough: // is short enough:
// //
@ -327,7 +331,7 @@ void cEvent::FixEpgBugs(void)
} }
} }
// Pro7 sometimes repeats the Title in the ShortText: // Sometimes they repeat the Title in the ShortText:
// //
// Title // Title
// Title // Title
@ -338,7 +342,7 @@ void cEvent::FixEpgBugs(void)
EpgBugFixStat(3, ChannelID()); EpgBugFixStat(3, ChannelID());
} }
// ZDF.info puts the ShortText between double quotes, which is nothing // Some channels put the ShortText between double quotes, which is nothing
// but annoying (some even put a '.' after the closing '"'): // but annoying (some even put a '.' after the closing '"'):
// //
// Title // Title