diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-06-01 18:30:58 +0400 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2014-06-01 18:35:26 +0400 |
| commit | 27630f41a7ac9bd0677d0df5a301a86785397a89 (patch) | |
| tree | 1e402bd62f297e500b88eb9516d2b9f414e793b8 /source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp | |
| parent | 7674ebf3407b4ac8dcf1ba88a9a240b619c13ae5 (diff) | |
Fix T40459: Gauss table can be NULL when ending the blur node operation,
which must not be passed to MEM_freeN.
Diffstat (limited to 'source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp index d5743c41c94..441b623b589 100644 --- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp @@ -157,8 +157,11 @@ void GaussianBokehBlurOperation::executePixel(float output[4], int x, int y, voi void GaussianBokehBlurOperation::deinitExecution() { BlurBaseOperation::deinitExecution(); - MEM_freeN(this->m_gausstab); - this->m_gausstab = NULL; + + if (this->m_gausstab) { + MEM_freeN(this->m_gausstab); + this->m_gausstab = NULL; + } deinitMutex(); } |