[PATCH] Fix memory leak in SalGtkFilePicker::execute.

Mark Wielaard (via Code Review) gerrit at gerrit.libreoffice.org
Tue Jun 4 14:07:13 PDT 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/4158

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/4158/1

Fix memory leak in SalGtkFilePicker::execute.

The result of g_filename_from_uri should be explicitly freed when done.

Change-Id: I194a562482531aa51cf31ed1f7dbc0ee59054d8b
---
M vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
1 file changed, 3 insertions(+), 1 deletion(-)



diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 7fed719..50ec20c 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -988,7 +988,8 @@
                     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 );
@@ -1035,6 +1036,7 @@
 
                             gtk_widget_destroy( dlg );
                         }
+                        g_free (gFileName);
 
                         if( btn == GTK_RESPONSE_YES )
                             retVal = ExecutableDialogResults::OK;

-- 
To view, visit https://gerrit.libreoffice.org/4158
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I194a562482531aa51cf31ed1f7dbc0ee59054d8b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard <mark at klomp.org>



More information about the LibreOffice mailing list