diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2011-04-17 13:05:13 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2011-04-17 13:05:13 +0200 |
commit | 8e3c9f553fd2b39007dd0066b2f88ac6d953755e (patch) | |
tree | e8a7acb0bc7ebf3912ad26ac4cd4bf4bc27068f4 /PLUGINS/src/osddemo/osddemo.c | |
parent | 79f8c5f38e0a24a5f30e0a29fb5c18f03c85c203 (diff) | |
download | vdr-8e3c9f553fd2b39007dd0066b2f88ac6d953755e.tar.gz vdr-8e3c9f553fd2b39007dd0066b2f88ac6d953755e.tar.bz2 |
Fixed a possible NULL pointer dereference in osddemo.c
Diffstat (limited to 'PLUGINS/src/osddemo/osddemo.c')
-rw-r--r-- | PLUGINS/src/osddemo/osddemo.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c index 43349471..9ad9df7b 100644 --- a/PLUGINS/src/osddemo/osddemo.c +++ b/PLUGINS/src/osddemo/osddemo.c @@ -3,13 +3,13 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: osddemo.c 2.4 2011/03/28 16:23:21 kls Exp $ + * $Id: osddemo.c 2.5 2011/04/17 13:05:13 kls Exp $ */ #include <vdr/osd.h> #include <vdr/plugin.h> -static const char *VERSION = "0.2.1"; +static const char *VERSION = "0.2.2"; static const char *DESCRIPTION = "Demo of arbitrary OSD setup"; static const char *MAINMENUENTRY = "Osd Demo"; @@ -263,12 +263,13 @@ void cTrueColorDemo::Action(void) case 3: { if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) { NextPixmap = CreateTextPixmap("Millions of colors", Line, 1, clrYellow, clrTransparent, Font); - if (NextPixmap) - FadeInPixmap = NextPixmap; delete Font; - Start = cTimeMs::Now(); - StartLine = Line; - Line += NextPixmap->DrawPort().Height(); + if (NextPixmap) { + FadeInPixmap = NextPixmap; + Start = cTimeMs::Now(); + StartLine = Line; + Line += NextPixmap->DrawPort().Height(); + } } State++; } |