Fixed a possible NULL pointer dereference in osddemo.c

CONTRIBUTORS

@@ -2631,6 +2631,7 @@ Paul Menzel <paulepanter@users.sourceforge.net>
  for adding LDFLAGS to the linker calls in the Makefiles
  for reporting a possible memory leak in the "pictures" plugin
  for removing an obsolete local variable in dvbsdffosd.c
+ for reporting a possible NULL pointer dereference in osddemo.c
 
 Radek Stastny <dedkus@gmail.com>
  for translating OSD texts to the Czech language

HISTORY

@@ -6599,3 +6599,4 @@ Video Disk Recorder Revision History
 - The dvbhddevice plugin is now part of the VDR distribution archive (thanks to
   Andreas Regel).
 - Removed an obsolete local variable in dvbsdffosd.c (thanks to Paul Menzel).
+- Fixed a possible NULL pointer dereference in osddemo.c (reported by Paul Menzel).

PLUGINS/src/osddemo/HISTORY

@@ -30,3 +30,7 @@ VDR Plugin 'osddemo' Revision History
 
 - Added Cancel(3) to ~cTrueColorDemo() (thanks to Reinhard Nissl).
 - Added a missing font deletion in cTrueColorDemo::Action() (thanks to Reinhard Nissl).
+
+2011-04-17: Version 0.2.2
+
+- Fixed a possible NULL pointer dereference in osddemo.c (reported by Paul Menzel).

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,13 +263,14 @@ 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;
+                          if (NextPixmap) {
+                             FadeInPixmap = NextPixmap;
                              Start = cTimeMs::Now();
                              StartLine = Line;
                              Line += NextPixmap->DrawPort().Height();
                              }
+                          }
                        State++;
                      }
                      break;