[Libreoffice-commits] .: Branch 'libreoffice-3-5' - basebmp/source

[Michael Meeks]

 basebmp/source/bitmapdevice.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 94d8de367cda097f868c28913337bae732e4e56b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 13 17:07:45 2011 +0100

    Make LineTest::testCornerCases succeed again after last basebmp fix.
    
    Though it looks wrong that rtl_allocateMemory(0) == 0.

diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index ec0d3bb..1586fce 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1889,7 +1889,7 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const basegfx::B2IVector&
         pMem.reset(
             reinterpret_cast<sal_uInt8*>(rtl_allocateMemory( nMemSize )),
             &rtl_freeMemory );
-        if (!pMem.get())
+        if (pMem.get() == 0 && nMemSize != 0)
             return BitmapDeviceSharedPtr();
         rtl_zeroMemory(pMem.get(),nMemSize);
     }