projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "SVACE Error fix TextureManager Thread bounds" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
texture-manager-impl.cpp
diff --git
a/dali-toolkit/internal/visuals/texture-manager-impl.cpp
b/dali-toolkit/internal/visuals/texture-manager-impl.cpp
index
b2e0d03
..
c867b91
100644
(file)
--- 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);
{
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;
}
return (numberOfThreads > 0) ? numberOfThreads : defaultValue;
}