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 NULL pointer dereference in osddemo.c

Browse Source
This commit is contained in:
Klaus Schmidinger 2011-04-17 13:05:13 +02:00
parent 79f8c5f38e
commit 8e3c9f553f
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

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

1
HISTORY
View File

@ -6599,3 +6599,4 @@ Video Disk Recorder Revision History
- The dvbhddevice plugin is now part of the VDR distribution archive (thanks to - The dvbhddevice plugin is now part of the VDR distribution archive (thanks to
Andreas Regel). Andreas Regel).
- Removed an obsolete local variable in dvbsdffosd.c (thanks to Paul Menzel). - 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).

4
PLUGINS/src/osddemo/HISTORY
View File

@ -30,3 +30,7 @@ VDR Plugin 'osddemo' Revision History
- Added Cancel(3) to ~cTrueColorDemo() (thanks to Reinhard Nissl). - Added Cancel(3) to ~cTrueColorDemo() (thanks to Reinhard Nissl).
- Added a missing font deletion in cTrueColorDemo::Action() (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).

15
PLUGINS/src/osddemo/osddemo.c
View File

@ -3,13 +3,13 @@
* *
* See the README file for copyright information and how to reach the author. * 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/osd.h>
#include <vdr/plugin.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 *DESCRIPTION = "Demo of arbitrary OSD setup";
static const char *MAINMENUENTRY = "Osd Demo"; static const char *MAINMENUENTRY = "Osd Demo";
@ -263,12 +263,13 @@ void cTrueColorDemo::Action(void)
case 3: { case 3: {
if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) { if (cFont *Font = cFont::CreateFont(DefaultFontOsd, osd->Height() / 10)) {
NextPixmap = CreateTextPixmap("Millions of colors", Line, 1, clrYellow, clrTransparent, Font); NextPixmap = CreateTextPixmap("Millions of colors", Line, 1, clrYellow, clrTransparent, Font);
if (NextPixmap)
FadeInPixmap = NextPixmap;
delete Font; delete Font;
Start = cTimeMs::Now(); if (NextPixmap) {
StartLine = Line; FadeInPixmap = NextPixmap;
Line += NextPixmap->DrawPort().Height(); Start = cTimeMs::Now();
StartLine = Line;
Line += NextPixmap->DrawPort().Height();
}
} }
State++; State++;
} }