From ae7950056b84568e591251d9d630bb3bbd994c21 Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Thu, 25 Apr 2024 10:01:10 +0900
Subject: [PATCH] Fix C++ generator of protocol version 2

- Remove uid check before getting appid
- Check whether the listener is nullptr or not

Change-Id: I310d080fd9d3c0ed70b96bb283aff71e386fd084
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 idlc/gen/version2/cpp_proxy_body_generator_cb.hh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/idlc/gen/version2/cpp_proxy_body_generator_cb.hh b/idlc/gen/version2/cpp_proxy_body_generator_cb.hh
index 7e3028d..302ca14 100644
--- a/idlc/gen/version2/cpp_proxy_body_generator_cb.hh
+++ b/idlc/gen/version2/cpp_proxy_body_generator_cb.hh
@@ -195,11 +195,13 @@ void <CLS_NAME>::DisposeCallback(const std::string& tag) {
 <METHODS>
 
 void <CLS_NAME>::OnLocalConnected() {
-  listener_->OnConnected();
+  if (listener_)
+    listener_->OnConnected();
 }
 
 void <CLS_NAME>::OnLocalDisconnected() {
-  listener_->OnDisconnected();
+  if (listener_)
+    listener_->OnDisconnected();
 }
 
 void <CLS_NAME>::OnLocalReceived(rpc_port_parcel_h parcel) {
@@ -265,18 +267,21 @@ void <CLS_NAME>::OnConnectedCb(const char* endpoint, const char* port_name, rpc_
   rpc_port_h cb_port = nullptr;
   rpc_port_proxy_get_port(handle->proxy_, RPC_PORT_PORT_CALLBACK, &cb_port);
   handle->callback_port_ = cb_port;
-  handle->listener_->OnConnected();
+  if (handle->listener_)
+    handle->listener_->OnConnected();
 }
 
 void <CLS_NAME>::OnDisconnectedCb(const char* endpoint, const char* port_name, void* user_data) {
   auto* handle = static_cast<<CLS_NAME>*>(user_data);
   handle->delegate_list_.clear();
-  handle->listener_->OnDisconnected();
+  if (handle->listener_)
+    handle->listener_->OnDisconnected();
 }
 
 void <CLS_NAME>::OnRejectedCb(const char* endpoint, const char* port_name, void* user_data) {
   auto* handle = static_cast<<CLS_NAME>*>(user_data);
-  handle->listener_->OnRejected();
+  if (handle->listener_)
+    handle->listener_->OnRejected();
 }
 
 void <CLS_NAME>::OnReceivedCb(const char* endpoint, const char* port_name, void* user_data) {
@@ -448,9 +453,6 @@ std::atomic<unsigned int> seq_ { 0 };
 std::string appid_;
 
 const std::string& GetAppId() {
-  if (getuid() < 5000)
-    return appid_;
-
   if (appid_.empty()) {
     char* id = nullptr;
     app_get_id(&id);
-- 
2.7.4