From c10446e9633bafeb1115345c2b2bbf753f83efc5 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Fri, 7 May 2021 13:51:39 +0900 Subject: [PATCH] tizen-rive-animation-renderer: + null check for safety. fix dereferenced null pointer case. Change-Id: I283ca89b9d44b1a3ab018639cfeadd80cd366fdb --- .../tizen-rive-animation-renderer.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dali-extension/vector-animation-renderer/tizen-rive-animation-renderer.cpp b/dali-extension/vector-animation-renderer/tizen-rive-animation-renderer.cpp index f7f6bc2b..3620c271 100644 --- a/dali-extension/vector-animation-renderer/tizen-rive-animation-renderer.cpp +++ b/dali-extension/vector-animation-renderer/tizen-rive-animation-renderer.cpp @@ -139,11 +139,10 @@ void TizenRiveAnimationRenderer::LoadRiveFile(const std::string& filename) if(mAnimation) { mAnimationInstance = new rive::LinearAnimationInstance(mAnimation); + mStartFrameNumber = mAnimation->enableWorkArea() ? mAnimation->workStart() : 0; + mTotalFrameNumber = mAnimation->enableWorkArea() ? mAnimation->workEnd() : mAnimation->duration(); + mTotalFrameNumber -= mStartFrameNumber; } - - mStartFrameNumber = mAnimation->enableWorkArea() ? mAnimation->workStart() : 0; - mTotalFrameNumber = mAnimation->enableWorkArea() ? mAnimation->workEnd() : mAnimation->duration(); - mTotalFrameNumber -= mStartFrameNumber; } bool TizenRiveAnimationRenderer::Load(const std::string& url) -- 2.34.1