From 33e95e4a2312a56fc1d1bafec1bc174cb16afa69 Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Mon, 15 Mar 2021 18:27:47 +0900
Subject: [PATCH] Fix exception handling of SendAndReceive() method

Change-Id: I5db0c5fbd04c9187375d7f008f30396427d4d4f1
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 src/aul_svc.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/aul_svc.cc b/src/aul_svc.cc
index 6ec38e3..0ad74b1 100644
--- a/src/aul_svc.cc
+++ b/src/aul_svc.cc
@@ -280,8 +280,12 @@ int SendAndReceive(int cmd, uid_t uid, bundle* request, bundle** response) {
   }
 
   auto ptr = std::unique_ptr<app_pkt_t, decltype(std::free)*>(pkt, std::free);
-  if (pkt->cmd != APP_GET_INFO_OK && pkt->cmd != cmd)
-    return AUL_SVC_RET_ERROR;
+  if (pkt->cmd != APP_GET_INFO_OK && pkt->cmd != cmd) {
+    if (pkt->cmd == APP_GET_INFO_ERROR)
+      return AUL_SVC_RET_ERROR;
+
+    return AulErrorConvert(aul_error_convert(pkt->cmd));
+  }
 
   bundle* b = nullptr;
   if (pkt->opt & AUL_SOCK_BUNDLE) {
-- 
2.7.4