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

Removed some unneeded code and fixed access to unallocated memory in cEvent::FixEpgBugs()

This commit is contained in:
Klaus Schmidinger 2005-02-19 11:37:15 +01:00
parent 7b9b2ad92d
commit f714ee0f55
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -1268,6 +1268,8 @@ Rolf Groppe <rolf@groppe.de>
Wolfgang Rohdewald <wolfgang@rohdewald.de> Wolfgang Rohdewald <wolfgang@rohdewald.de>
for pointing out that primaryDevice = NULL should be done before deleting the devices for pointing out that primaryDevice = NULL should be done before deleting the devices
in cDevice::Shutdown() in cDevice::Shutdown()
for removing some unneeded code and fixing access to unallocated memory in
cEvent::FixEpgBugs()
Chad Flynt <hoochster@sofnet.com> Chad Flynt <hoochster@sofnet.com>
for suggestions and experiments regarding the buffer reserve in cTransfer for suggestions and experiments regarding the buffer reserve in cTransfer

5
HISTORY
View File

@ -3415,3 +3415,8 @@ Video Disk Recorder Revision History
from starting Transfer Mode in order to replay DD over the DVB device. 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 - Added missing reset of the 'repacker' to cTS2PES::Clear() (thanks to Marco
Schlüßler for reporting this one). 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).

6
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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 #ifndef __CONFIG_H
@ -20,8 +20,8 @@
#include "i18n.h" #include "i18n.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.3.21" #define VDRVERSION "1.3.22"
#define VDRVERSNUM 10321 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10322 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99 #define MAXPRIORITY 99
#define MAXLIFETIME 99 #define MAXLIFETIME 99

4
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.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" #include "epg.h"
@ -525,7 +525,7 @@ void cEvent::FixEpgBugs(void)
if (description) { if (description) {
char *p = description; char *p = description;
while (*p && *(p + 1) && *(p + 2)) { 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" if (!startswith(p + 2, "und ")) { // special case in German, as in "Lach- und Sachgeschichten"
memmove(p, p + 2, strlen(p + 2) + 1); memmove(p, p + 2, strlen(p + 2) + 1);
EpgBugFixStat(5, ChannelID()); EpgBugFixStat(5, ChannelID());