From patchwork Fri Feb 18 10:12:22 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Wolfgang Rohdewald <wolfgang@rohdewald.de>
X-Patchwork-Id: 11784
Received: from natpreptil.rzone.de ([81.169.145.163])
	by www.linuxtv.org with esmtp (Exim 4.34) id 1D257F-0001Fv-MT
	for vdr@linuxtv.org; Fri, 18 Feb 2005 11:12:05 +0100
Received: from wr.rohdewald.de (p548FD671.dip.t-dialin.net [84.143.214.113])
	by post.webmailer.de (8.13.1/8.13.1) with ESMTP id j1IAC5iE006601
	for <vdr@linuxtv.org>; Fri, 18 Feb 2005 11:12:06 +0100 (MET)
Received: by wr.rohdewald.de (Postfix, from userid 107)
	id CC2C0270028; Fri, 18 Feb 2005 11:12:34 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
	by wr.rohdewald.de (Postfix) with ESMTP id 39EDF270021
	for <vdr@linuxtv.org>; Fri, 18 Feb 2005 11:12:23 +0100 (CET)
From: Wolfgang Rohdewald <wolfgang@rohdewald.de>
To: vdr@linuxtv.org
Date: Fri, 18 Feb 2005 11:12:22 +0100
User-Agent: KMail/1.7.2
MIME-Version: 1.0
Content-Disposition: inline
Message-Id: <200502181112.22523.wolfgang@rohdewald.de>
X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on wr.rohdewald.de
X-Spam-Level: 
X-Spam-Status: No, score=-2.8 required=5.0 tests=ALL_TRUSTED autolearn=ham
	version=3.0.2
Subject: [vdr] [PATCH] bug in epg.c
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: wolfgang@rohdewald.de, Klaus Schmidinger's VDR <vdr@linuxtv.org>
List-Id: Klaus Schmidinger's VDR <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Feb 2005 10:12:06 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 161

this patch removes unneeded code and inhibits access to unallocated memory:
(the latter found by valgrind)

--- /tmp/epg.c  2005-02-18 10:44:55.000762224 +0100
+++ epg.c       2005-02-18 10:45:56.379431248 +0100
@@ -525,7 +525,7 @@
      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());