diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2004-08-08 14:21:17 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2004-08-08 14:21:17 +0200 |
| commit | c896678b0c32782b48540fcf4c48e063545c4365 (patch) | |
| tree | afbff991f6334e064647ce421346e451caa9a9e8 | |
| parent | 30da608c70f2a7ff23bfdf49c158630ed57d0bf2 (diff) | |
| download | vdr-c896678b0c32782b48540fcf4c48e063545c4365.tar.gz vdr-c896678b0c32782b48540fcf4c48e063545c4365.tar.bz2 | |
Fixed a possible NULL pointer assignment in cMenuText::SetText()
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | menu.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index a2109316..50b2d3d2 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1036,6 +1036,7 @@ Marco Schlüßler <marco@lordzodiac.de> 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 @@ -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,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) |