Fixed a possible NULL pointer assignment in cMenuText::SetText()

This commit is contained in:
Klaus Schmidinger 2004-08-08 14:21:17 +02:00
parent 30da608c70
commit c896678b0c
3 changed files with 5 additions and 2 deletions

View File

@ -1036,6 +1036,7 @@ Marco Schl
for fixing handling error case '-1' when polling section filters
for suggesting to avoiding flashing effects in the OSD of full featured DVB cards
by explicitly clearing the OSD windows before opening them
for fixing a possible NULL pointer assignment in cMenuText::SetText()
Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP

View File

@ -2972,3 +2972,5 @@ Video Disk Recorder Revision History
- Fixed checking for the presence of NPTL (thanks to Jouni Karvo).
- Making sure section filters are only set if the device actually has a lock
(thanks to Andreas Share for pointing this out).
- Fixed a possible NULL pointer assignment in cMenuText::SetText() (thanks to
Marco Schlüssler).

4
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: menu.c 1.309 2004/06/13 20:26:51 kls Exp $
* $Id: menu.c 1.310 2004/08/08 14:19:37 kls Exp $
*/
#include "menu.h"
@ -514,7 +514,7 @@ cMenuText::~cMenuText()
void cMenuText::SetText(const char *Text)
{
free(text);
text = strdup(Text);
text = Text ? strdup(Text) : NULL;
}
void cMenuText::Display(void)