Fix svace issue, DEREF_AFTER_NULL case 62/56062/5
authortaeyoon <taeyoon0.lee@samsung.com>
Tue, 22 Dec 2015 10:50:10 +0000 (19:50 +0900)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 6 Jan 2016 10:21:37 +0000 (02:21 -0800)
  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

dali/devel-api/rendering/material.cpp

index 7695082..00af995 100644 (file)
@@ -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 )