From 464552dd91a170f5e6c69650a6df1af871a2ad1a Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 15 May 2011 11:46:30 +0200 Subject: Fixed cString's operator=(const char *String) in case the given string is the same as the existing one --- CONTRIBUTORS | 4 ++++ HISTORY | 5 +++++ config.h | 10 +++++----- tools.c | 4 +++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f6ba82c7..baef5ecb 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2697,3 +2697,7 @@ Sergiu Dotenco Mika Laitio for reporting a case where cRecordingInfo::Read(FILE *f) was called with a NULL pointer + +Dirk Leber + for fixing cString's operator=(const char *String) in case the given string is the + same as the existing one diff --git a/HISTORY b/HISTORY index c4e22fd8..3dff3b5a 100644 --- a/HISTORY +++ b/HISTORY @@ -6606,3 +6606,8 @@ Video Disk Recorder Revision History - Added handling of "ANSI/SCTE 57" descriptors (thanks too Rolf Ahrenberg). - Avoiding an unecessary call to Recordings.ResetResume() (thanks to Reinhard Nissl). + +2011-04-29: Version 1.7.19 + +- Fixed cString's operator=(const char *String) in case the given string is the + same as the existing one (thanks to Dirk Leber). diff --git a/config.h b/config.h index e4ac2f2a..0d76e939 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 2.30 2011/03/13 12:02:31 kls Exp $ + * $Id: config.h 2.31 2011/05/15 11:46:30 kls Exp $ */ #ifndef __CONFIG_H @@ -22,13 +22,13 @@ // VDR's own version number: -#define VDRVERSION "1.7.18" -#define VDRVERSNUM 10718 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.7.19" +#define VDRVERSNUM 10719 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: -#define APIVERSION "1.7.18" -#define APIVERSNUM 10718 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "1.7.19" +#define APIVERSNUM 10719 // Version * 10000 + Major * 100 + Minor // When loading plugins, VDR searches them by their APIVERSION, which // may be smaller than VDRVERSION in case there have been no changes to diff --git a/tools.c b/tools.c index a493529d..6a98bf69 100644 --- a/tools.c +++ b/tools.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: tools.c 2.13 2011/03/20 15:20:00 kls Exp $ + * $Id: tools.c 2.14 2011/04/29 14:51:14 kls Exp $ */ #include "tools.h" @@ -906,6 +906,8 @@ cString &cString::operator=(const cString &String) cString &cString::operator=(const char *String) { + if (s == String) + return *this; free(s); s = String ? strdup(String) : NULL; return *this; -- cgit v1.2.3