From f714ee0f55920c09738abf37d61d7f1295b5d2e7 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 19 Feb 2005 11:37:15 +0100
Subject: [PATCH] Removed some unneeded code and fixed access to unallocated
 memory in cEvent::FixEpgBugs()

---
 CONTRIBUTORS | 2 ++
 HISTORY      | 5 +++++
 config.h     | 6 +++---
 epg.c        | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 94258a46..89d7d1c8 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1268,6 +1268,8 @@ Rolf Groppe <rolf@groppe.de>
 Wolfgang Rohdewald <wolfgang@rohdewald.de>
  for pointing out that primaryDevice = NULL should be done before deleting the devices
  in cDevice::Shutdown()
+ for removing some unneeded code and fixing access to unallocated memory in
+ cEvent::FixEpgBugs()
 
 Chad Flynt <hoochster@sofnet.com>
  for suggestions and experiments regarding the buffer reserve in cTransfer
diff --git a/HISTORY b/HISTORY
index 9a873b81..12836d48 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3415,3 +3415,8 @@ Video Disk Recorder Revision History
   from starting Transfer Mode in order to replay DD over the DVB device.
 - Added missing reset of the 'repacker' to cTS2PES::Clear() (thanks to Marco
   Schlüßler for reporting this one).
+
+2005-02-19: Version 1.3.22
+
+- Removed some unneeded code and fixed access to unallocated memory in
+  cEvent::FixEpgBugs() (thanks to Wolfgang Rohdewald).
diff --git a/config.h b/config.h
index 7dffe140..07e91603 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 1.213 2005/02/08 11:22:14 kls Exp $
+ * $Id: config.h 1.214 2005/02/19 11:35:16 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,8 +20,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.21"
-#define VDRVERSNUM   10321  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.22"
+#define VDRVERSNUM   10322  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/epg.c b/epg.c
index 5539ab04..df267f63 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 <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.24 2005/01/02 11:25:25 kls Exp $
+ * $Id: epg.c 1.25 2005/02/19 11:35:00 kls Exp $
  */
 
 #include "epg.h"
@@ -525,7 +525,7 @@ void cEvent::FixEpgBugs(void)
      if (description) {
         char *p = description;
         while (*p && *(p + 1) && *(p + 2)) {
-              if (*p == '-' && *(p + 1) == ' ' && *(p + 2) && islower(*(p - 1)) && islower(*(p + 2))) {
+              if (*p == '-' && *(p + 1) == ' ' && p != description && islower(*(p - 1)) && islower(*(p + 2))) {
                  if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten"
                     memmove(p, p + 2, strlen(p + 2) + 1);
                     EpgBugFixStat(5, ChannelID());