[Libreoffice-commits] core.git: vcl/unx

Caolán McNamara caolanm at redhat.com
Fri May 4 15:49:52 UTC 2018


 vcl/unx/gtk3/gtk3gtkframe.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 5e34e3741de8aae10bf30889c227581818276186
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 4 16:44:43 2018 +0100

    memory from getenv is not ours to free
    
    regrssion from...
    
    commit c3074cb5784329eaf558c2f58d96a64085b42d48
    Author: Chris Sherlock <chris.sherlock79 at gmail.com>
    Date:   Sun Jan 7 00:39:33 2018 +1100
    
        vcl: remove dead code
    
    Change-Id: I3295ece62e97d00e56db95d0005d13d2a97984c2
    Reviewed-on: https://gerrit.libreoffice.org/53858
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 8a18974d2635..3595e0bf20c7 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -385,8 +385,7 @@ bool GtkSalFrame::doKeyCallback( guint state,
     vcl::DeletionListener aDel( this );
 
 #if OSL_DEBUG_LEVEL > 0
-    char* pKeyDebug = nullptr;
-    pKeyDebug = getenv("VCL_GTK3_PAINTDEBUG");
+    const char* pKeyDebug = getenv("VCL_GTK3_PAINTDEBUG");
 
     if (pKeyDebug && *pKeyDebug == '1')
     {
@@ -413,8 +412,6 @@ bool GtkSalFrame::doKeyCallback( guint state,
             }
         }
     }
-
-    free(pKeyDebug);
 #endif
 
     /*


More information about the Libreoffice-commits mailing list