From ca61494ed55277059890404871548bfdfdd0260f Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Wed, 9 May 2018 14:57:52 +0900 Subject: [PATCH] Check NULL return value in video-view-impl.cpp - The return value of GetMap() has to be checked for NULL pointer dereference in video-view-impl.cpp Change-Id: Ic6b13c491cf8c8ac1dfef710a851833e8bf55769 Signed-off-by: Seoyeon Kim --- dali-toolkit/internal/controls/video-view/video-view-impl.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp index baacf73..cd11ea1 100755 --- a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp +++ b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp @@ -194,7 +194,11 @@ void VideoView::SetPropertyMap( Property::Map map ) if( shaderValue ) { - mEffectPropertyMap = *( shaderValue->GetMap() ); + Property::Map* shaderMap = shaderValue->GetMap(); + if( shaderMap ) + { + mEffectPropertyMap = *shaderMap; + } } } -- 2.7.4