From b83a595d3a301c81b697826a48c69f58635f83fb Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Tue, 12 Dec 2017 10:19:46 +0000 Subject: [PATCH] SVACE Error fix TextureManager Thread bounds Should be able to resolve SVACE error by asserting on the maximum number allowed. Preventing TextureManager sign-compare Error with strtoul (old arch) Change-Id: I081635e8f1f1a69e7426041344440a53c5b80121 --- dali-toolkit/internal/visuals/texture-manager-impl.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dali-toolkit/internal/visuals/texture-manager-impl.cpp b/dali-toolkit/internal/visuals/texture-manager-impl.cpp index b2e0d03..c867b91 100644 --- a/dali-toolkit/internal/visuals/texture-manager-impl.cpp +++ b/dali-toolkit/internal/visuals/texture-manager-impl.cpp @@ -47,7 +47,9 @@ size_t GetNumberOfThreads(const char* environmentVariable, size_t defaultValue) { using Dali::EnvironmentVariable::GetEnvironmentVariable; auto numberString = GetEnvironmentVariable(environmentVariable); - auto numberOfThreads = numberString ? std::strtol(numberString, nullptr, 10) : 0; + 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; } -- 2.7.4