[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source

[Tor Lillqvist]

 sc/source/core/opencl/formulagroupcl.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit d419638be7062f291a59f039a7469455fc08d2df
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Feb 10 20:04:01 2015 +0200

    Don't call clReleaseProgram() on the same program twice
    
    If the clBuildProgram() failed, the lastSecondProgram variable kept as its
    value the already released program handle, and later we called
    clReleaseProgram() on it again. This is certainly wrong, and caused a crash at
    least with my OpenCL implementation.
    
    As such I am not sure if that lastOneProgram, lastSecondProgram etc dance is
    sane...
    
    Change-Id: Ic3454338a431ac49fafc11d0157609bc9ecd4d10
    Reviewed-on: https://gerrit.libreoffice.org/14406
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index afc19d4..96d3dc1 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3802,6 +3802,7 @@ void DynamicKernel::CreateKernel()
         if (lastSecondProgram)
         {
             clReleaseProgram(lastSecondProgram);
+            lastSecondProgram = NULL;
         }
         if (::opencl::buildProgramFromBinary("",
                 &::opencl::gpuEnv, KernelHash.c_str(), 0))