[3.0] Fix Svace issues

- Return value of a function GetMap() has to be checked for NULL at shader-impl.cpp
- Use 'rand_r' function instead of vulnerable function 'rand' at random.h

Change-Id: Ib28207bcb87b073eea34887233514c31958c11f1

diff --git a/dali/internal/event/rendering/shader-impl.cpp b/dali/internal/event/rendering/shader-impl.cpp
index 698a03b..127de82 100644 (file)
--- a/dali/internal/event/rendering/shader-impl.cpp
+++ b/dali/internal/event/rendering/shader-impl.cpp
@@ -168,29 +168,32 @@ void Shader::SetDefaultProperty( Property::Index index,
       if( propertyValue.GetType() == Property::MAP )
       {
         Dali::Property::Map* map = propertyValue.GetMap();
-        std::string vertex;
-        std::string fragment;
-        Dali::Shader::ShaderHints hints(Dali::Shader::HINT_NONE);
-
-        if( Property::Value* value = map->Find("vertex") )
-        {
-          vertex = value->Get<std::string>();
-        }
-
-        if( Property::Value* value = map->Find("fragment") )
+        if( map )
         {
-          fragment = value->Get<std::string>();
+          std::string vertex;
+          std::string fragment;
+          Dali::Shader::ShaderHints hints(Dali::Shader::HINT_NONE);
+
+          if( Property::Value* value = map->Find("vertex") )
+          {
+            vertex = value->Get<std::string>();
+          }
+
+          if( Property::Value* value = map->Find("fragment") )
+          {
+            fragment = value->Get<std::string>();
+          }
+
+          if( Property::Value* value = map->Find("hints") )
+          {
+            static_cast<void>( // ignore return
+              Scripting::GetEnumeration< Dali::Shader::ShaderHints >(value->Get<std::string>().c_str(),
+                                                                     ShaderHintsTable, ShaderHintsTableSize, hints)
+              );
+          }
+
+          Initialize(vertex, fragment, hints );
         }
-
-        if( Property::Value* value = map->Find("hints") )
-        {
-          static_cast<void>( // ignore return
-            Scripting::GetEnumeration< Dali::Shader::ShaderHints >(value->Get<std::string>().c_str(),
-                                                                   ShaderHintsTable, ShaderHintsTableSize, hints)
-            );
-        }
-
-        Initialize(vertex, fragment, hints );
       }
       else
       {

diff --git a/dali/public-api/math/random.h b/dali/public-api/math/random.h
index 5ba0c95..394b2dd 100644 (file)
--- a/dali/public-api/math/random.h
+++ b/dali/public-api/math/random.h
@@ -35,6 +35,11 @@ namespace Dali
 namespace Random
 {
 
+namespace
+{
+  __thread unsigned int seed;
+}
+
 /**
  * @brief Returns a random number between f0 and f1.
  *
@@ -46,9 +51,10 @@ namespace Random
  */
 inline float Range(float f0, float f1)
 {
+  seed = time(NULL);
   float min = std::min(f0, f1);
   float max = std::max(f0, f1);
-  return min + (rand() & 0xfff) * (max-min) * (1.0f/4095.0f);
+  return min + (rand_r(&seed) & 0xfff) * (max-min) * (1.0f/4095.0f);
 }
 
 /**