summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2013-06-04 22:02:39 +0200
committerCaolán McNamara <caolanm@redhat.com>2013-06-05 10:07:53 +0100
commit2d8d546a64b8cdde50dcd0d203abe9bce2451f14 (patch)
treee99b9e212e4267664f29171389fd204fae176507 /vcl
parent9f1e4bc48597ba429001cd4d1707983bc5f426a0 (diff)
Fix memory leak in SalGtkFilePicker::execute.
The result of g_filename_from_uri should be explicitly freed when done. Change-Id: I194a562482531aa51cf31ed1f7dbc0ee59054d8b Reviewed-on: https://gerrit.libreoffice.org/4158 Reviewed-by: Noel Power <noel.power@suse.com> Tested-by: Noel Power <noel.power@suse.com> (cherry picked from commit 32345f9963dd2900da174d9c7dec6a070fce8f9c)
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 102e16e552ad..88cb3de954b5 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -986,7 +986,8 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException )
if( aPathSeq.getLength() == 1 )
{
OString sFileName = unicodetouri( aPathSeq[0] );
- if( g_file_test( g_filename_from_uri( sFileName.getStr(), NULL, NULL ), G_FILE_TEST_IS_REGULAR ) )
+ gchar *gFileName = g_filename_from_uri ( sFileName.getStr(), NULL, NULL );
+ if( g_file_test( gFileName, G_FILE_TEST_IS_REGULAR ) )
{
GtkWidget *dlg;
INetURLObject aFileObj( sFileName );
@@ -1033,6 +1034,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException )
gtk_widget_destroy( dlg );
}
+ g_free (gFileName);
if( btn == GTK_RESPONSE_YES )
retVal = ExecutableDialogResults::OK;