commit a775188f6bbf3bbf8448b2b7398a1902908bb5e2
author Mark Wielaard <mark@klomp.org> Sat Jun 08 00:51:45 2013 +0200
committer David Tardon <dtardon@redhat.com> Mon Jun 10 04:58:56 2013 +0000
tree c189e36a66e1b39fb25d8b94368306596d8cb8f6
parent 66558cc3783fd1645661043901a4eee371c95de9

Fix memory leak in OGLTransitionerImpl::createWindow.

XFree the result of glXChooseVisual, glXGetVisualFromFBConfig and
glXGetFBConfigs when done.

Change-Id: I145c7f5f083718d983ccea4b534d4e90056eb14e
Reviewed-on: https://gerrit.libreoffice.org/4195
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 3c12fee..65c992a 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -537,7 +537,13 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
            for ( ; i < nfbconfigs; i++)
            {
                visinfo = glXGetVisualFromFBConfig (GLWin.dpy, fbconfigs[i]);
                if( !visinfo || visinfo->visualid != vi->visualid )
                if( !visinfo )
                    continue;

                unx::VisualID visualid = visinfo->visualid;
                XFree ( visinfo );

                if ( visualid != vi->visualid )
                    continue;

                glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i], GLX_DRAWABLE_TYPE, &value);
@@ -565,11 +571,14 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
                /* TODO: handle non Y inverted cases */
                break;
            }
            if (vi != firstVisual)
                XFree (vi);

            if( i != nfbconfigs ) {
                vi = glXGetVisualFromFBConfig( GLWin.dpy, fbconfigs[i] );
                mbHasTFPVisual = true;
                pChildSysData = lcl_createSystemWindow( vi, pPWindow, &pWindow );
                XFree ( vi );
                SAL_INFO("slideshow.opengl", "found visual suitable for texture_from_pixmap");
            } else if( firstVisual && pAttributeTable[1] == NULL ) {
                vi = firstVisual;
@@ -577,8 +586,10 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
                pChildSysData = lcl_createSystemWindow( vi, pPWindow, &pWindow );
                SAL_INFO("slideshow.opengl", "did not find visual suitable for texture_from_pixmap, using " << vi->visualid);
            }
            XFree ( fbconfigs );
#else
            pChildSysData = lcl_createSystemWindow( vi, pPWindow, &pWindow );
            XFree ( vi );
#endif
            if ( pChildSysData )
                break;
@@ -586,6 +597,12 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )

        ++pAttributeTable;
    }

#if defined( GLX_VERSION_1_3 ) && defined( GLX_EXT_texture_from_pixmap )
    if ( firstVisual )
        XFree (firstVisual);
#endif

#endif

#if defined( _WIN32 )