diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2015-03-25 08:57:05 +0100 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2015-03-25 08:57:05 +0100 |
commit | 909e6c6249939e61e27a039b04da5ea296191cbe (patch) | |
tree | 72a8878c27ed5f468bc50af28eb1bb9c7f9f94b9 | |
parent | 62596f991ebf30a61cdbe1de15acd2c63f598149 (diff) | |
download | vdr-909e6c6249939e61e27a039b04da5ea296191cbe.tar.gz vdr-909e6c6249939e61e27a039b04da5ea296191cbe.tar.bz2 |
Fixed a crash in cOsd::SetAreas() in case CreatePixmap() returns NULL
-rw-r--r-- | osd.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.c 4.1 2015/03/08 13:54:47 kls Exp $ + * $Id: osd.c 4.2 2015/03/25 08:57:05 kls Exp $ */ #include "osd.h" @@ -1842,7 +1842,10 @@ eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas) width = Areas[0].x2 - Areas[0].x1 + 1; height = Areas[0].y2 - Areas[0].y1 + 1; cPixmap *Pixmap = CreatePixmap(0, cRect(Areas[0].x1, Areas[0].y1, width, height)); - Pixmap->Clear(); + if (Pixmap) + Pixmap->Clear(); + else + Result = oeOutOfMemory; bitmaps[numBitmaps++] = new cBitmap(10, 10, 8); // dummy bitmap for GetBitmap() } else { |