summaryrefslogtreecommitdiff
path: root/osd.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2007-08-12 11:36:14 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2007-08-12 11:36:14 +0200
commitdbcc5173544db29a67bfb331ddad7ed9f1c95552 (patch)
treea08b2758c9077f813c45b4bf3a3cac2a00e7003d /osd.c
parentab7fd0a903bca7a23c9ce4dfbc47830f0456fd55 (diff)
downloadvdr-dbcc5173544db29a67bfb331ddad7ed9f1c95552.tar.gz
vdr-dbcc5173544db29a67bfb331ddad7ed9f1c95552.tar.bz2
cBitmap::SetXpm() now checks whether the given Xpm pointer is not NULL
Diffstat (limited to 'osd.c')
-rw-r--r--osd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/osd.c b/osd.c
index ec7f9a3c..013ef8b7 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.c 1.71 2007/07/20 14:51:36 kls Exp $
+ * $Id: osd.c 1.72 2007/08/12 11:33:17 kls Exp $
*/
#include "osd.h"
@@ -321,6 +321,8 @@ bool cBitmap::LoadXpm(const char *FileName)
bool cBitmap::SetXpm(const char *const Xpm[], bool IgnoreNone)
{
+ if (!Xpm)
+ return false;
const char *const *p = Xpm;
int w, h, n, c;
if (4 != sscanf(*p, "%d %d %d %d", &w, &h, &n, &c)) {