From c0ef2e7a3a8d9e39339b00701d1e800cfd8f23ca Mon Sep 17 00:00:00 2001 From: "Jinho, Lee" Date: Tue, 11 Apr 2017 09:31:49 +0900 Subject: [PATCH] SVACE issue resolved Change-Id: I085825149a1e9611824798571322d23ae0e4e890 --- dali/internal/render/shaders/program.cpp | 7 ++++--- dali/internal/update/gestures/scene-graph-pan-gesture.cpp | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dali/internal/render/shaders/program.cpp b/dali/internal/render/shaders/program.cpp index e769a81..0f22758 100644 --- a/dali/internal/render/shaders/program.cpp +++ b/dali/internal/render/shaders/program.cpp @@ -272,14 +272,15 @@ void Program::GetActiveSamplerUniforms() //Determine declaration order of each sampler char* fragShader = strdup( mProgramData->GetFragmentShader() ); - const char* token = strtok( fragShader, " ;\n"); + char* nextPtr = NULL; + const char* token = strtok_r( fragShader, " ;\n", &nextPtr ); int samplerPosition = 0; while( token ) { if( ( strncmp( token, "sampler2D", 9u ) == 0 ) || ( strncmp( token, "samplerCube", 11u ) == 0 ) ) { bool found( false ); - token = strtok( NULL, " ;\n"); + token = strtok_r( NULL, " ;\n", &nextPtr ); for( size_t i=0; i