diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-09-06 09:27:22 +0100 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:07:49 -0500 |
commit | 2df8514694dd127561aca43289f5dbc96201ea79 (patch) | |
tree | 5f2edd9eb9d57c350c67e72dffa20814b8746c53 | |
parent | b465a97637c0196054e50f92cfd689707342afdc (diff) |
ofz#3028 check bitmap creation for failure
Change-Id: I8c1a2c3873e53153564a5aabc4cc8903622cf054
(cherry picked from commit af53581cd12a4d265719acca0c59fb4490e15951)
(cherry picked from commit cc3ba0bdaf545bca0541fcdb79563935b8e5df6d)
-rw-r--r-- | vcl/headless/svpgdi.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index da8377787eca..992cd674aae5 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -1151,7 +1151,13 @@ SalBitmap* SvpSalGraphics::getBitmap( long nX, long nY, long nWidth, long nHeigh aPal[0] = Color(COL_BLACK); aPal[1] = Color(COL_WHITE); } - pBitmap->Create(Size(nWidth, nHeight), GetBitCount(), aPal); + + if (!pBitmap->Create(Size(nWidth, nHeight), GetBitCount(), aPal)) + { + SAL_WARN("vcl.gdi", "SvpSalGraphics::getBitmap, cannot create bitmap"); + delete pBitmap; + return nullptr; + } cairo_surface_t* target = SvpSalGraphics::createCairoSurface(pBitmap->GetBuffer()); cairo_t* cr = cairo_create(target); |