From d5af62db09138cca2dffaf75db87485b7ae5073f Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Wed, 28 Feb 2024 20:10:00 +0900 Subject: [PATCH] Fix svace issue : nullptr check for inputMethodContextP Change-Id: I4fbebeed7e4058a88788a757ee423f995d68c999 Signed-off-by: Eunki, Hong --- .../input-method-context-wrap.cpp | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dali-csharp-binder/dali-adaptor/input-method-context-wrap.cpp b/dali-csharp-binder/dali-adaptor/input-method-context-wrap.cpp index af61e3d0..e2e8f057 100755 --- a/dali-csharp-binder/dali-adaptor/input-method-context-wrap.cpp +++ b/dali-csharp-binder/dali-adaptor/input-method-context-wrap.cpp @@ -47,18 +47,21 @@ Dali::InputMethodContext::CallbackData OnEventReceivedCallback(Dali::InputMethod eventDataP = (Dali::InputMethodContext::EventData *)&eventData; - auto* keyboardEventSignal = &inputMethodContextP->EventReceivedSignal(); - - auto iter = swig_callbackOnEventReceivedMapper.find(keyboardEventSignal); - if(iter != swig_callbackOnEventReceivedMapper.end()) + if(DALI_LIKELY(inputMethodContextP)) { - auto callbackEventReceived = iter->second; - if(callbackEventReceived) + auto* keyboardEventSignal = &inputMethodContextP->EventReceivedSignal(); + + auto iter = swig_callbackOnEventReceivedMapper.find(keyboardEventSignal); + if(iter != swig_callbackOnEventReceivedMapper.end()) { - callbackDataP = (Dali::InputMethodContext::CallbackData *)callbackEventReceived(inputMethodContextP, eventDataP); - if (callbackDataP) + auto callbackEventReceived = iter->second; + if(callbackEventReceived) { - callbackData = *callbackDataP; + callbackDataP = (Dali::InputMethodContext::CallbackData *)callbackEventReceived(inputMethodContextP, eventDataP); + if (callbackDataP) + { + callbackData = *callbackDataP; + } } } } -- 2.34.1