From ff2eebfa6184f631e8c1fdd57e288af30576233b Mon Sep 17 00:00:00 2001
From: Jihun Ha <jihun.ha@samsung.com>
Date: Wed, 1 Feb 2017 19:13:17 +0900
Subject: [PATCH] Fix defects detected by static analysis

1. nativeRemoteEnrollee and jRemoteEnrollee are initialized with NULL.
2. NULL is returned if global lister for event lister fails to create.

Change-Id: I9b77acb439f4f42e5c382370d060d525e5d6e652
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/16939
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
---
 .../richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.cpp       | 4 ++--
 .../richsdk/android/EasySetupCore/src/main/jni/JniEsListenerManager.h | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.cpp b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.cpp
index e9cebf6..4332919 100755
--- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.cpp
+++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEasySetup.cpp
@@ -40,8 +40,8 @@ Java_org_iotivity_service_easysetup_mediator_EasySetup_nativeCreateRemoteEnrolle
 {
     ES_LOGI("JniEasySetup::nativeCreateRemoteEnrollee enter");
 
-    std::shared_ptr<RemoteEnrollee> nativeRemoteEnrollee;
-    jobject jRemoteEnrollee;
+    std::shared_ptr<RemoteEnrollee> nativeRemoteEnrollee = NULL;
+    jobject jRemoteEnrollee = NULL;
 
     if(!jResource)
     {
diff --git a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEsListenerManager.h b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEsListenerManager.h
index 98daf1d..bd7021f 100755
--- a/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEsListenerManager.h
+++ b/service/easy-setup/mediator/richsdk/android/EasySetupCore/src/main/jni/JniEsListenerManager.h
@@ -74,13 +74,14 @@ class JniEsListenerManager
                     m_listenerMap.insert(
                         std::pair < jobject,
                         std::pair<T *, int >> (jgListener, std::pair<T *, int>(onEventListener, 1)));
+                    ES_LOGD("OnEventListener: new listener");
                 }
                 else
                 {
                     ES_LOGD("OnEventListener: Failed to create global listener ref.");
                     delete onEventListener;
+                    onEventListener = NULL;
                 }
-                ES_LOGD("OnEventListener: new listener");
             }
             m_mapMutex.unlock();
             return onEventListener;
-- 
2.7.4