diff options
| -rw-r--r-- | CONTRIBUTORS | 3 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | recording.h | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 9e354519..fc714ed8 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2684,3 +2684,6 @@ Juergen Lock <vdr-l@jelal.kn-bremen.de> Sergiu Dotenco <sergiu.dotenco@googlemail.com> for reporting a missing initialization in sDvbSpuRect for replacing "%lld" and "%llX" print format specifiers with "PRId64" and "PRIX64" + +Mika Laitio <lamikr@pilppa.org> + for reporting a case where cRecordingInfo::Read(FILE *f) was called with a NULL pointer @@ -6594,3 +6594,5 @@ Video Disk Recorder Revision History (thanks to Reinhard Nissl). - Fixed a buffer overflow in cFont::Bidi() (thanks to Reinhard Nissl). - Added HD stream content identifiers to vdr.5 (thanks to Christoph Haubrich). +- Made cRecordingInfo::Read(FILE *f) private to avoid calls to it from outside + cRecordingInfo or cRecording (reported by Mika Laitio). diff --git a/recording.h b/recording.h index 459c1ca0..3410ae23 100644 --- a/recording.h +++ b/recording.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.h 2.17 2011/03/20 10:33:30 kls Exp $ + * $Id: recording.h 2.18 2011/04/03 11:14:37 kls Exp $ */ #ifndef __RECORDING_H @@ -57,6 +57,7 @@ private: int lifetime; char *fileName; cRecordingInfo(const cChannel *Channel = NULL, const cEvent *Event = NULL); + bool Read(FILE *f); void SetData(const char *Title, const char *ShortText, const char *Description); void SetAux(const char *Aux); public: @@ -72,7 +73,6 @@ public: const char *Aux(void) const { return aux; } double FramesPerSecond(void) const { return framesPerSecond; } void SetFramesPerSecond(double FramesPerSecond); - bool Read(FILE *f); bool Write(FILE *f, const char *Prefix = "") const; bool Read(void); bool Write(void) const; |