[3.0] Fixed Svace defect

[Defect - DEREF_AFTER_NULL, FALL_THROUGH]
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I9a877f7c9d815457e2d4e8998deefa46e5f22ac2

diff --git a/dali/internal/event/actors/actor-impl.cpp b/dali/internal/event/actors/actor-impl.cpp
index da3e0ba..ed3669b 100644 (file)
--- a/dali/internal/event/actors/actor-impl.cpp
+++ b/dali/internal/event/actors/actor-impl.cpp
@@ -4007,6 +4007,7 @@ Vector2 Actor::ApplySizeSetPolicy( const Vector2 size )
           return size;
         }
       }
+      break;
     }
 
     default:

diff --git a/dali/internal/event/rendering/material-impl.cpp b/dali/internal/event/rendering/material-impl.cpp
index abac5a4..1fcfb29 100644 (file)
--- a/dali/internal/event/rendering/material-impl.cpp
+++ b/dali/internal/event/rendering/material-impl.cpp
@@ -112,7 +112,10 @@ void Material::SetTextureImage( size_t index, Image* image )
       }
     }
 
-    mTextures[index].mImage.Reset(image);
+    if( image )
+    {
+      mTextures[index].mImage.Reset(image);
+    }
     SceneGraph::SetTextureImageMessage( GetEventThreadServices(), *mSceneObject, index, mTextures[index].mImage.Get()->GetResourceId() );
   }
 }