From c5b20b17413fabb6821e5f10fe144cbd66ed40a7 Mon Sep 17 00:00:00 2001
From: jiangyuwei <yuwei.jiang@samsung.com>
Date: Mon, 8 Apr 2024 16:34:14 +0800
Subject: [PATCH] [M120 Migration] Add error check when get system info

Add error check when get system info.

References:
 - https://review.tizen.org/gerrit/#/c/295962/

Change-Id: I8fdf2e49049ee3c05802b63dc6dfe9443170704b
Signed-off-by: jiangyuwei <yuwei.jiang@samsung.com>
---
 tizen_src/chromium_impl/tizen/system_info.cc | 56 +++++++++++++++-------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/tizen_src/chromium_impl/tizen/system_info.cc b/tizen_src/chromium_impl/tizen/system_info.cc
index 30223cd..569ee0d 100644
--- a/tizen_src/chromium_impl/tizen/system_info.cc
+++ b/tizen_src/chromium_impl/tizen/system_info.cc
@@ -26,8 +26,19 @@ void GetProfile(void) {
     return;
 
 #if BUILDFLAG(IS_TIZEN)
-  char *profileName;
-  system_info_get_platform_string("http://tizen.org/feature/profile", &profileName);
+  char* profileName = nullptr;
+  int result = system_info_get_platform_string(
+      "http://tizen.org/feature/profile", &profileName);
+
+  if (result != SYSTEM_INFO_ERROR_NONE || !profileName) {
+#if (IS_TIZEN_TV)
+    g_profile__ = PROFILE_TV;
+#else
+    g_profile__ = PROFILE_COMMON;
+#endif
+    free(profileName);
+    return;
+  }
 #if defined(ARCH_CPU_RISCV_FAMILY)
   if (const char* env_profile = std::getenv(PROFILE_ENV_STRING))
   {
@@ -97,30 +108,23 @@ void GetArch(void) {
   if (g_arch__ != ARCH_UNKNOWN)
     return;
 
-  char *archName;
-  system_info_get_platform_string("http://tizen.org/feature/platform.core.cpu.arch", &archName);
-
-  int archNamelen = strlen(archName);
-  if (strncmp(archName, "armv7", archNamelen) == 0) {
-    g_arch__ = ARCH_ARMV7;
-  }
-  else if (strncmp(archName, "aarch64", archNamelen) == 0) {
-    g_arch__ = ARCH_AARCH64;
-  }
-  else if (strncmp(archName, "x86", archNamelen) == 0) {
-    g_arch__ = ARCH_X86;
-  }
-  else if (strncmp(archName, "x86_64", archNamelen) == 0) {
-    g_arch__ = ARCH_X86_64;
-  }
-  else if (strncmp(archName, "rv32", archNamelen) == 0) {
-    g_arch__ = ARCH_RV32;
-  }
-  else if (strncmp(archName, "rv64", archNamelen) == 0) {
-    g_arch__ = ARCH_RV64;
-  }
-  else {
-    g_arch__ = ARCH_UNKNOWN;
+  char* archName = nullptr;
+  int result = system_info_get_platform_string(
+      "http://tizen.org/feature/platform.core.cpu.arch", &archName);
+
+  if (result == SYSTEM_INFO_ERROR_NONE && archName) {
+    int archNamelen = strlen(archName);
+    if (strncmp(archName, "armv7", archNamelen) == 0) {
+      g_arch__ = ARCH_ARMV7;
+    } else if (strncmp(archName, "aarch64", archNamelen) == 0) {
+      g_arch__ = ARCH_AARCH64;
+    } else if (strncmp(archName, "x86", archNamelen) == 0) {
+      g_arch__ = ARCH_X86;
+    } else if (strncmp(archName, "x86_64", archNamelen) == 0) {
+      g_arch__ = ARCH_X86_64;
+    } else {
+      g_arch__ = ARCH_UNKNOWN;
+    }
   }
   free(archName);
 #endif
-- 
2.7.4