From 18f0ce26fd383f56aa0afdfb9e5ce8ea4c4d0b76 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Thu, 10 Sep 2015 11:00:59 +0200 Subject: [PATCH] The character 0x0D is now stripped from EPG texts --- CONTRIBUTORS | 3 +++ HISTORY | 1 + epg.c | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d22ba771..0d30eac8 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3416,3 +3416,6 @@ Daniel Ribeiro 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ä + for reporting that some broadcasters use the character 0x0D in EPG texts diff --git a/HISTORY b/HISTORY index 387a7885..4d5a804a 100644 --- a/HISTORY +++ b/HISTORY @@ -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ä). diff --git a/epg.c b/epg.c index 3dde2045..4297350e 100644 --- a/epg.c +++ b/epg.c @@ -7,7 +7,7 @@ * Original version (as used in VDR before 1.3.0) written by * Robert Schneider and Rolf Hakenes . * - * $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;