Fix Svace warning issue

- Missing break in switch statement at text-effects-style.cpp
- Prevention of Null pointer dereference at builder-impl.cpp

Change-Id: I1fcf28fbc1aff8c4b5e707f2bf79c6247112bae5
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>

diff --git a/dali-toolkit/internal/builder/builder-impl.cpp b/dali-toolkit/internal/builder/builder-impl.cpp
index d9672bb..1d648c3 100644 (file)
--- a/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/dali-toolkit/internal/builder/builder-impl.cpp
@@ -1014,10 +1014,13 @@ bool Builder::ConvertChildValue( const TreeNode& mappingRoot, KeyStack& keyStack
     case Property::MAP:
     {
       Property::Map* map = child.GetMap();
     case Property::MAP:
     {
       Property::Map* map = child.GetMap();

-      for( Property::Map::SizeType i=0; i < map->Count(); ++i )
+      if( map )

       {
       {

-        Property::Value& child = map->GetValue(i);
-        ConvertChildValue(mappingRoot, keyStack, child);
+        for( Property::Map::SizeType i=0; i < map->Count(); ++i )
+        {
+          Property::Value& child = map->GetValue(i);
+          ConvertChildValue(mappingRoot, keyStack, child);
+        }

       }
       break;
     }
       }
       break;
     }


@@ -1025,10 +1028,13 @@ bool Builder::ConvertChildValue( const TreeNode& mappingRoot, KeyStack& keyStack
     case Property::ARRAY:
     {
       Property::Array* array = child.GetArray();
     case Property::ARRAY:
     {
       Property::Array* array = child.GetArray();

-      for( Property::Array::SizeType i=0; i < array->Count(); ++i )
+      if( array )

       {
       {

-        Property::Value& child = array->GetElementAt(i);
-        ConvertChildValue(mappingRoot, keyStack, child);
+        for( Property::Array::SizeType i=0; i < array->Count(); ++i )
+        {
+          Property::Value& child = array->GetElementAt(i);
+          ConvertChildValue(mappingRoot, keyStack, child);
+        }

       }
       break;
     }
       }
       break;
     }

diff --git a/dali-toolkit/internal/text/property-string-parser.cpp b/dali-toolkit/internal/text/property-string-parser.cpp
index c120e00..42b1050 100644 (file)
--- a/dali-toolkit/internal/text/property-string-parser.cpp
+++ b/dali-toolkit/internal/text/property-string-parser.cpp
@@ -72,8 +72,10 @@ void ParsePropertyString( const std::string& property, Property::Map& map )
   if( parser.Parse( property ) )
   {
     const TreeNode* const node = parser.GetRoot();
   if( parser.Parse( property ) )
   {
     const TreeNode* const node = parser.GetRoot();

-
-    CreatePropertyMap( node, map );
+    if( node )
+    {
+      CreatePropertyMap( node, map );
+    }

   }
 }
 
   }
 }
 

diff --git a/dali-toolkit/internal/text/text-effects-style.cpp b/dali-toolkit/internal/text/text-effects-style.cpp
index 7172f23..31580a2 100644 (file)
--- a/dali-toolkit/internal/text/text-effects-style.cpp
+++ b/dali-toolkit/internal/text/text-effects-style.cpp
@@ -113,6 +113,7 @@ bool SetUnderlineProperties( ControllerPtr controller, const Property::Value& va
             controller->SetUnderlineHeight( thickness );
             update = true;
           }
             controller->SetUnderlineHeight( thickness );
             update = true;
           }

+          break;

         }
         case EffectStyle::INPUT:
         {
         }
         case EffectStyle::INPUT:
         {


@@ -226,6 +227,7 @@ bool SetShadowProperties( ControllerPtr controller, const Property::Value& value
             controller->SetShadowOffset( offset );
             update = true;
           }
             controller->SetShadowOffset( offset );
             update = true;
           }

+          break;

         }
         case EffectStyle::INPUT:
         {
         }
         case EffectStyle::INPUT:
         {