frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed cString's operator=(const char *String) in case the given string is the same as the existing one

Browse Source
This commit is contained in:
Klaus Schmidinger 2011-05-15 11:46:30 +02:00
parent 914b04c1d2
commit 464552dd91
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@ -2697,3 +2697,7 @@ Sergiu Dotenco <sergiu.dotenco@googlemail.com>
Mika Laitio <lamikr@pilppa.org> Mika Laitio <lamikr@pilppa.org>
for reporting a case where cRecordingInfo::Read(FILE *f) was called with a NULL pointer for reporting a case where cRecordingInfo::Read(FILE *f) was called with a NULL pointer
Dirk Leber <dirk.leber@reel-multimedia.com>
for fixing cString's operator=(const char *String) in case the given string is the
same as the existing one

5
HISTORY
View File

@ -6606,3 +6606,8 @@ Video Disk Recorder Revision History
- Added handling of "ANSI/SCTE 57" descriptors (thanks too Rolf Ahrenberg). - Added handling of "ANSI/SCTE 57" descriptors (thanks too Rolf Ahrenberg).
- Avoiding an unecessary call to Recordings.ResetResume() (thanks to Reinhard - Avoiding an unecessary call to Recordings.ResetResume() (thanks to Reinhard
Nissl). 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).

10
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 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 #ifndef __CONFIG_H
@ -22,13 +22,13 @@
// VDR's own version number: // VDR's own version number:
#define VDRVERSION "1.7.18" #define VDRVERSION "1.7.19"
#define VDRVERSNUM 10718 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10719 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:
#define APIVERSION "1.7.18" #define APIVERSION "1.7.19"
#define APIVERSNUM 10718 // Version * 10000 + Major * 100 + Minor #define APIVERSNUM 10719 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which // When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to // may be smaller than VDRVERSION in case there have been no changes to

4
tools.c
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: 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" #include "tools.h"
@ -906,6 +906,8 @@ cString &cString::operator=(const cString &String)
cString &cString::operator=(const char *String) cString &cString::operator=(const char *String)
{ {
if (s == String)
return *this;
free(s); free(s);
s = String ? strdup(String) : NULL; s = String ? strdup(String) : NULL;
return *this; return *this;