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 a possible segfault in cSkins::Message()

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-12-01 13:35:41 +01:00
parent 5945e2b1cb
commit 3e0659a10a
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1474,6 +1474,7 @@ Udo Richter <udo_richter@gmx.de>
for reporting that an assignment in svdrp.c didn't use the cTimer::operator=()) for reporting that an assignment in svdrp.c didn't use the cTimer::operator=())
for suggesting that the function cThread::Cancel() should only set 'running' to for suggesting that the function cThread::Cancel() should only set 'running' to
false and not actually kill the thread if the special value -1 is given false and not actually kill the thread if the special value -1 is given
or fixing a possible segfault in cSkins::Message()
Sven Kreiensen <svenk@kammer.uni-hannover.de> Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date

3
HISTORY
View File

@ -4986,6 +4986,7 @@ Video Disk Recorder Revision History
- Fixed displaying the replay mode symbol in case of "Multi speed mode" (reported - Fixed displaying the replay mode symbol in case of "Multi speed mode" (reported
by Marco Schlüßler). by Marco Schlüßler).
2006-11-19: Version 1.4.4-1 2006-12-01: Version 1.4.4-1
- Some improvements to the man pages (thanks to Ville Skyttä). - Some improvements to the man pages (thanks to Ville Skyttä).
- Fixed a possible segfault in cSkins::Message() (thanks to Udo Richter).

4
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 1.277 2006/11/04 13:19:31 kls Exp $ * $Id: config.h 1.278 2006/12/01 13:33:26 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -21,7 +21,7 @@
// VDR's own version number: // VDR's own version number:
#define VDRVERSION "1.4.4" #define VDRVERSION "1.4.4-1"
#define VDRVERSNUM 10404 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10404 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:

7
skins.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: skins.c 1.11 2006/06/03 14:39:14 kls Exp $ * $Id: skins.c 1.12 2006/12/01 13:32:37 kls Exp $
*/ */
#include "skins.h" #include "skins.h"
@ -226,8 +226,11 @@ eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
} }
if (!Current()) if (!Current())
return kNone; return kNone;
if (!cSkinDisplay::Current() && !displayMessage) if (!cSkinDisplay::Current()) {
if (displayMessage)
delete displayMessage;
displayMessage = Current()->DisplayMessage(); displayMessage = Current()->DisplayMessage();
}
cSkinDisplay::Current()->SetMessage(Type, s); cSkinDisplay::Current()->SetMessage(Type, s);
cSkinDisplay::Current()->Flush(); cSkinDisplay::Current()->Flush();
cStatus::MsgOsdStatusMessage(s); cStatus::MsgOsdStatusMessage(s);