Fix svace issue : nullptr check for inputMethodContextP 67/306867/2
authorEunki, Hong <eunkiki.hong@samsung.com>
Wed, 28 Feb 2024 11:10:00 +0000 (20:10 +0900)
committerEunki Hong <eunkiki.hong@samsung.com>
Mon, 4 Mar 2024 04:52:08 +0000 (04:52 +0000)
Change-Id: I4fbebeed7e4058a88788a757ee423f995d68c999
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
dali-csharp-binder/dali-adaptor/input-method-context-wrap.cpp

index af61e3d..e2e8f05 100755 (executable)
@@ -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;
+        }
       }
     }
   }