summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY1
-rw-r--r--player.c5
3 files changed, 5 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4d984a83..12ffc0e0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -735,6 +735,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
for pointing out a "near miss" condition in cCondVar
for reporting a bug in cChannel::SetName() in case only the ShortName or Provider
has changed
+ for fixing a possible recursion in cControl::Shutdown()
Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
for modifying LOF handling to allow for C-band reception
diff --git a/HISTORY b/HISTORY
index 5bef4288..0c29d49b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3154,3 +3154,4 @@ Video Disk Recorder Revision History
Brugger for reporting this one).
- Fixed some characters in the iso8859-2 font file (thanks to Dino Ravnic).
- Fixed some errors in the Croatian language texts (thanks to Dino Ravnic).
+- Fixed a possible recursion in cControl::Shutdown() (thanks to Sascha Volkenandt).
diff --git a/player.c b/player.c
index c08e4230..2b306c0b 100644
--- a/player.c
+++ b/player.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: player.c 1.7 2004/04/16 13:34:11 kls Exp $
+ * $Id: player.c 1.8 2004/11/20 11:33:08 kls Exp $
*/
#include "player.h"
@@ -88,6 +88,7 @@ void cControl::Attach(void)
void cControl::Shutdown(void)
{
- delete control;
+ cControl *c = control; // avoids recursions
control = NULL;
+ delete c;
}