frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

The character 0x0D is now stripped from EPG texts

This commit is contained in:
Klaus Schmidinger 2015-09-10 11:00:59 +02:00
parent bc0de5dbc5
commit 18f0ce26fd
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -3416,3 +3416,6 @@ Daniel Ribeiro <drwyrm@gmail.com>
for reporting a problem with setting the source value of newly created channels, in
case the NIT is received from a different, but very close satellite position, and
for helping to debug this
Janne Pänkälä <epankala@gmail.com>
for reporting that some broadcasters use the character 0x0D in EPG texts

1
HISTORY
View File

@ -8807,3 +8807,4 @@ Video Disk Recorder Revision History
between connected VDRs by simply selecting the desired machine in this field.
- The SVDRP command DELT no longer checks whether the timer that shall be deleted
is currently recording.
- The character 0x0D is now stripped from EPG texts (reported by Janne Pänkälä).

4
epg.c
View File

@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
*
* $Id: epg.c 4.1 2015/08/23 10:39:59 kls Exp $
* $Id: epg.c 4.2 2015/09/10 10:58:19 kls Exp $
*/
#include "epg.h"
@ -661,7 +661,7 @@ static void StripControlCharacters(char *s)
uchar *p = (uchar *)s;
if (l == 2 && *p == 0xC2) // UTF-8 sequence
p++;
if (*p == 0x86 || *p == 0x87) {
if (*p == 0x86 || *p == 0x87 || *p == 0x0D) {
memmove(s, p + 1, len - l + 1); // we also copy the terminating 0!
len -= l;
l = 0;