From 7367b6a832ccf97a02024f6ec8e436403c19efaa Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 29 Apr 2006 13:23:15 +0200 Subject: Fixed a memory leak in closing the video file during replay --- CONTRIBUTORS | 1 + HISTORY | 1 + recording.c | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 0f82d14e..54e36dfa 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1864,6 +1864,7 @@ Richard Lithvall Tobias Grimm for suggesting to use geteuid() to check whether VDR is running as user 'root' for fixing a memory leak in handling external EPG data + for fixing a memory leak in closing the video file during replay Helge Lenz for reporting a bug in setting the 'Delta' parameter when calling the shutdown diff --git a/HISTORY b/HISTORY index ca596c7e..3b587815 100644 --- a/HISTORY +++ b/HISTORY @@ -4684,3 +4684,4 @@ Video Disk Recorder Revision History is active (thanks to Udo Richter; bug reported by Dominique Simon). - Updated the Polish OSD texts (thanks to Jaroslaw Swierczynski). - Fixed a memory leak in handling external EPG data (thanks to Tobias Grimm). +- Fixed a memory leak in closing the video file during replay (thanks to Tobias Grimm). diff --git a/recording.c b/recording.c index 351713e9..229cfee5 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 1.147 2006/04/23 10:43:06 kls Exp $ + * $Id: recording.c 1.148 2006/04/29 13:22:20 kls Exp $ */ #include "recording.h" @@ -1436,7 +1436,7 @@ cUnbufferedFile *cFileName::Open(void) void cFileName::Close(void) { if (file) { - if ((record && CloseVideoFile(file) < 0) || (!record && file->Close() < 0)) + if (CloseVideoFile(file) < 0) LOG_ERROR_STR(fileName); file = NULL; } -- cgit v1.2.3