frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Now checking for NULL in cOsd::AddPixmap()

This commit is contained in:
Klaus Schmidinger 2012-03-03 13:25:22 +01:00
parent 0432198e0b
commit 78c1fee7f8
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -2284,6 +2284,7 @@ Christoph Haubrich <christoph1.haubrich@arcor.de>
for adding support for HbbTV to libsi
for fixing cRecording::LengthInSeconds(), which wrongfully rounded the result to full
minutes
for suggesting to check for NULL in cOsd::AddPixmap()
Pekka Mauno <pekka.mauno@iki.fi>
for fixing cSchedule::GetFollowingEvent() in case there is currently no present

4
HISTORY
View File

@ -6959,3 +6959,7 @@ Video Disk Recorder Revision History
is actually going to be switched or has actually been switched successfully"
which was made in version 1.1.10, so please report if this has any unwanted
side effects.
2012-03-03: Version 1.7.26
- Now checking for NULL in cOsd::AddPixmap() (suggested by Christoph Haubrich).

10
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: config.h 2.43 2012/02/29 12:28:01 kls Exp $
* $Id: config.h 2.44 2012/03/03 13:25:22 kls Exp $
*/
#ifndef __CONFIG_H
@ -22,13 +22,13 @@
// VDR's own version number:
#define VDRVERSION "1.7.25"
#define VDRVERSNUM 10725 // Version * 10000 + Major * 100 + Minor
#define VDRVERSION "1.7.26"
#define VDRVERSNUM 10726 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
#define APIVERSION "1.7.25"
#define APIVERSNUM 10725 // Version * 10000 + Major * 100 + Minor
#define APIVERSION "1.7.26"
#define APIVERSNUM 10726 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to

14
osd.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: osd.c 2.25 2012/03/02 10:48:19 kls Exp $
* $Id: osd.c 2.26 2012/03/03 13:20:15 kls Exp $
*/
#include "osd.h"
@ -1701,11 +1701,13 @@ void cOsd::DestroyPixmap(cPixmap *Pixmap)
cPixmap *cOsd::AddPixmap(cPixmap *Pixmap)
{
LOCK_PIXMAPS;
if (numPixmaps < MAXOSDPIXMAPS)
return pixmaps[numPixmaps++] = Pixmap;
else
esyslog("ERROR: too many OSD pixmaps requested (maximum is %d)", MAXOSDPIXMAPS);
if (Pixmap) {
LOCK_PIXMAPS;
if (numPixmaps < MAXOSDPIXMAPS)
return pixmaps[numPixmaps++] = Pixmap;
else
esyslog("ERROR: too many OSD pixmaps requested (maximum is %d)", MAXOSDPIXMAPS);
}
return NULL;
}