From: taeyoon <taeyoon0.lee@samsung.com>
Date: Tue, 22 Dec 2015 10:50:10 +0000 (+0900)
Subject: Fix svace issue, DEREF_AFTER_NULL case
X-Git-Tag: dali_1.1.16~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F62%2F56062%2F5;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Fix svace issue, DEREF_AFTER_NULL case

  Move 'SetTextureImage( index, imagePtr )' to if statement for checking image handle
  - If image handle is NULL, imagePtr is also NULL in SetTextureImage().

Change-Id: I2dc389090f094e85cd0eb6285756434dcdb90617
---

diff --git a/dali/devel-api/rendering/material.cpp b/dali/devel-api/rendering/material.cpp
index 7695082..00af995 100644
--- a/dali/devel-api/rendering/material.cpp
+++ b/dali/devel-api/rendering/material.cpp
@@ -98,13 +98,12 @@ void Material::RemoveTexture( size_t index )
 
 void Material::SetTextureImage( size_t index, Image image )
 {
-  Internal::Image* imagePtr(0);
   if( image )
   {
+    Internal::Image* imagePtr(0);
     imagePtr = &GetImplementation( image );
+    GetImplementation(*this).SetTextureImage( index, imagePtr );
   }
-
-  GetImplementation(*this).SetTextureImage( index, imagePtr );
 }
 
 void Material::SetTextureSampler( size_t index, Sampler sampler )