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

Fixed a NULL pointer access with the cUnbufferedFile when a replay session runs all the way until the end of the recording

This commit is contained in:
Klaus Schmidinger 2005-11-04 13:19:49 +01:00
parent 697261c981
commit 23ee5bb4da
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

@ -1319,6 +1319,8 @@ Mogens Elneff <mogens@elneff.dk>
Joachim Wilke <vdr@joachim-wilke.de>
for reporting missing calls to cStatus::MsgOsdClear() in cSkins::Message()
for fixing a NULL pointer access with the cUnbufferedFile when a replay session
runs all the way until the end of the recording
Sascha Klek <sklek@gmx.de>
for reporting a problem with the '0' key in the "Day" item of the "Timers" menu

5
HISTORY
View File

@ -3912,3 +3912,8 @@ Video Disk Recorder Revision History
- Fixed the cFilter example in PLUGINS.html (reported by Patrick Fischer).
- The new class cUnbufferedFile is used for the recording files to avoid
trashing the file system cache (based on a patch by Ralf Müller).
2005-11-04: Version 1.3.36
- Fixed a NULL pointer access with the cUnbufferedFile when a replay session runs
all the way until the end of the recording (thanks to Joachim Wilke).

6
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: config.h 1.231 2005/10/08 08:48:38 kls Exp $
* $Id: config.h 1.232 2005/11/04 13:17:42 kls Exp $
*/
#ifndef __CONFIG_H
@ -19,8 +19,8 @@
#include "i18n.h"
#include "tools.h"
#define VDRVERSION "1.3.35"
#define VDRVERSNUM 10335 // Version * 10000 + Major * 100 + Minor
#define VDRVERSION "1.3.36"
#define VDRVERSNUM 10336 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99
#define MAXLIFETIME 99

4
recording.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: recording.c 1.122 2005/10/31 12:27:58 kls Exp $
* $Id: recording.c 1.123 2005/11/04 13:17:20 kls Exp $
*/
#include "recording.h"
@ -1342,7 +1342,7 @@ cUnbufferedFile *cFileName::SetOffset(int Number, int Offset)
// found a non existing file suffix
}
if (Open() >= 0) {
if (!record && Offset >= 0 && file->Seek(Offset, SEEK_SET) != Offset) {
if (!record && Offset >= 0 && file && file->Seek(Offset, SEEK_SET) != Offset) {
LOG_ERROR_STR(fileName);
return NULL;
}