From 7a569c82507d441c1e1f47f48f76d02c5baa3542 Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Wed, 17 Jul 2013 18:56:22 +0900 Subject: [PATCH] Fix Called C++ object pointer is null MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Duval --- .../interface/html5/HTML5DrawingEngine.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp b/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp index f1434a3fe9..ce6e4e800c 100644 --- a/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp +++ b/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp @@ -1095,14 +1095,17 @@ HTML5DrawingEngine::_ExtractBitmapRegions(ServerBitmap& bitmap, uint32 options, bitmaps[i] = new(std::nothrow) UtilityBitmap( BRect(0, 0, targetWidth - 1, targetHeight - 1), bitmap.ColorSpace(), 0); - if (bitmaps[i] == NULL) - result = B_NO_MEMORY; - result = bitmaps[i]->ImportBits(bitmap.Bits(), bitmap.BitsLength(), - bitmap.BytesPerRow(), bitmap.ColorSpace(), sourceRect.LeftTop(), - BPoint(0, 0), targetWidth, targetHeight); - if (result != B_OK) - delete bitmaps[i]; + if (bitmaps[i] == NULL) { + result = B_NO_MEMORY; + } else { + result = bitmaps[i]->ImportBits(bitmap.Bits(), bitmap.BitsLength(), + bitmap.BytesPerRow(), bitmap.ColorSpace(), sourceRect.LeftTop(), + BPoint(0, 0), targetWidth, targetHeight); + + if (result != B_OK) + delete bitmaps[i]; + } } if (result != B_OK) {