mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a memory leak

Browse Source 
The stream should be freed eventually in any case.

Change-Id: I5432b48de5641adc7a13a852fea49adc18bf963b
Reviewed-on: https://gerrit.libreoffice.org/9016
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Takeshi Abe
2014-04-16 00:22:16 +09:00
committed by Caolán McNamara
parent a0656ed338
commit 2a3e221c88
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/source/uielement/imagebuttontoolbarcontroller.cxx
View File

@@ -40,6 +40,7 @@
#include <vcl/graphicfilter.hxx> #include <vcl/graphicfilter.hxx>
#include <vcl/toolbox.hxx> #include <vcl/toolbox.hxx>
#include <svtools/miscopt.hxx> #include <svtools/miscopt.hxx>
#include <boost/scoped_ptr.hpp>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::com::sun::star::awt; using namespace ::com::sun::star::awt;
@@ -159,7 +160,7 @@ void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star
bool ImageButtonToolbarController::ReadImageFromURL( bool bBigImage, const OUString& aImageURL, Image& aImage ) bool ImageButtonToolbarController::ReadImageFromURL( bool bBigImage, const OUString& aImageURL, Image& aImage )
{ {
SvStream* pStream = utl::UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ ); boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ ));
if ( pStream && ( pStream->GetErrorCode() == 0 )) if ( pStream && ( pStream->GetErrorCode() == 0 ))
{ {
// Use graphic class to also support more graphic formats (bmp,png,...) // Use graphic class to also support more graphic formats (bmp,png,...)
@@ -183,7 +184,6 @@ bool ImageButtonToolbarController::ReadImageFromURL( bool bBigImage, const OUStr
} }
} }
delete pStream;
return false; return false;
} }