From: Agnelo Vaz <agnelo.vaz@samsung.com>
Date: Thu, 14 Dec 2017 14:36:13 +0000 (+0000)
Subject: Explictly check upper bound to satisfy SVACE when using strtoul
X-Git-Tag: dali_1.3.4~2^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=1a28300d578c8b97c395d79910c588d10a8e086f

Explictly check upper bound to satisfy SVACE when using strtoul

Should have been able to fix SVACE error by asserting on the maximum number allowed
but that does not work with strtoul only with strtol!!

Possible issue with SVACE.

Added ASSERT_DEBUG so users knows that the set value of threads failed and default
is being used

Merged into other 4.0 branch with patch "SVACE Error fix TextureManager Thread bounds"

Change-Id: Ic412c92160bcb910f99db30a43273af0c9cf68a1
---

diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.cpp b/dali-toolkit/internal/visuals/texture-manager-impl.cpp
index c867b91..11d3b0f 100644
--- a/dali-toolkit/internal/visuals/texture-manager-impl.cpp
+++ b/dali-toolkit/internal/visuals/texture-manager-impl.cpp
@@ -49,8 +49,8 @@ size_t GetNumberOfThreads(const char* environmentVariable, size_t defaultValue)
   auto numberString = GetEnvironmentVariable(environmentVariable);
   auto numberOfThreads = numberString ? std::strtoul(numberString, nullptr, 10) : 0;
   constexpr auto MAX_NUMBER_OF_THREADS = 100u;
-  DALI_ASSERT_ALWAYS( numberOfThreads < MAX_NUMBER_OF_THREADS );
-  return (numberOfThreads > 0) ? numberOfThreads : defaultValue;
+  DALI_ASSERT_DEBUG( numberOfThreads < MAX_NUMBER_OF_THREADS );
+  return ( numberOfThreads > 0 && numberOfThreads < MAX_NUMBER_OF_THREADS ) ? numberOfThreads : defaultValue;
 }
 
 size_t GetNumberOfLocalLoaderThreads()