Ticket #9877: 0011-Fix-Called-C-object-pointer-is-null.patch

File 0011-Fix-Called-C-object-pointer-is-null.patch, 1.5 KB (added by mt, 11 years ago)

New patch

  • src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp 

    From 0bdd6fc0b486f13af97a9a115dc2e55a588132ae Mon Sep 17 00:00:00 2001
From: Murai Takashi <tmurai01@gmail.com>
Date: Wed, 17 Jul 2013 18:56:22 +0900
Subject: [PATCH] Fix Called C++ object pointer is null

---
 .../drawing/interface/html5/HTML5DrawingEngine.cpp |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp b/src/servers/app/drawing/interface/html5/HTML5DrawingEngine.cpp
index f1434a3..ce6e4e8 100644
    a b HTML5DrawingEngine::_ExtractBitmapRegions(ServerBitmap& bitmap, uint32 options,  
    10951095            bitmaps[i] = new(std::nothrow) UtilityBitmap(
    10961096                BRect(0, 0, targetWidth - 1, targetHeight - 1),
    10971097                bitmap.ColorSpace(), 0);
    1098             if (bitmaps[i] == NULL)
     1098
     1099            if (bitmaps[i] == NULL) {
    10991100                result = B_NO_MEMORY;
     1101            } else {
     1102                result = bitmaps[i]->ImportBits(bitmap.Bits(), bitmap.BitsLength(),
     1103                    bitmap.BytesPerRow(), bitmap.ColorSpace(), sourceRect.LeftTop(),
     1104                    BPoint(0, 0), targetWidth, targetHeight);
    11001105
    1101             result = bitmaps[i]->ImportBits(bitmap.Bits(), bitmap.BitsLength(),
    1102                 bitmap.BytesPerRow(), bitmap.ColorSpace(), sourceRect.LeftTop(),
    1103                 BPoint(0, 0), targetWidth, targetHeight);
    1104             if (result != B_OK)
    1105                 delete bitmaps[i];
     1106                if (result != B_OK)
     1107                    delete bitmaps[i];
     1108            }
    11061109        }
    11071110
    11081111        if (result != B_OK) {