From 8649adedc9d607143f3813fd5cb43b94268c3450 Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Fri, 21 Apr 2023 03:14:20 +0000
Subject: [PATCH] Fix build error for gcc 12.2.0

- Add missing header inclusions
- Fix wrong if statement

Change-Id: I0a517be1ab498c8c577eaedf4aecb5b372d6ccbd
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 src/app-defined-loader/src/config.hh              | 1 +
 src/launchpad-process-pool/hydra_sigchld_event.cc | 9 +++++----
 src/lib/launchpad-common/app_packet.hh            | 1 +
 src/lib/launchpad-common/peer_credentials.cc      | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app-defined-loader/src/config.hh b/src/app-defined-loader/src/config.hh
index 4188329..f68e17d 100644
--- a/src/app-defined-loader/src/config.hh
+++ b/src/app-defined-loader/src/config.hh
@@ -20,6 +20,7 @@
 #include <iniparser.h>
 
 #include <memory>
+#include <string>
 
 namespace launchpad {
 
diff --git a/src/launchpad-process-pool/hydra_sigchld_event.cc b/src/launchpad-process-pool/hydra_sigchld_event.cc
index b39871a..f09f093 100644
--- a/src/launchpad-process-pool/hydra_sigchld_event.cc
+++ b/src/launchpad-process-pool/hydra_sigchld_event.cc
@@ -71,10 +71,11 @@ void HydraSigchldEvent::OnIOEventReceived(int fd, int condition) {
     return;
 
   auto peer_creds = PeerCredentials::Get(client_socket->GetFd());
-  if (!peer_creds) {
-    if (CheckPermission(peer_creds->GetPid()) != 0)
-      return;
-  }
+  if (!peer_creds)
+    return;
+
+  if (CheckPermission(peer_creds->GetPid()) != 0)
+    return;
 
   pid_t pid = -1;
   if (client_socket->Receive(&pid, sizeof(pid)) != 0)
diff --git a/src/lib/launchpad-common/app_packet.hh b/src/lib/launchpad-common/app_packet.hh
index 983ae2b..07ba8b9 100644
--- a/src/lib/launchpad-common/app_packet.hh
+++ b/src/lib/launchpad-common/app_packet.hh
@@ -17,6 +17,7 @@
 #ifndef LIB_LAUNCHPAD_COMMON_APP_PACKET_HH_
 #define LIB_LAUNCHPAD_COMMON_APP_PACKET_HH_
 
+#include <cstddef>
 #include <cstdint>
 #include <vector>
 
diff --git a/src/lib/launchpad-common/peer_credentials.cc b/src/lib/launchpad-common/peer_credentials.cc
index c2ac128..4446194 100644
--- a/src/lib/launchpad-common/peer_credentials.cc
+++ b/src/lib/launchpad-common/peer_credentials.cc
@@ -51,4 +51,5 @@ std::unique_ptr<PeerCredentials> PeerCredentials::Get(int fd) {
 
   return std::make_unique<PeerCredentials>(cred.pid, cred.uid, cred.gid);
 }
+
 }  // namespace launchpad
-- 
2.7.4