From 5ce4e65fbbd03376925860f88998c02490f7603f Mon Sep 17 00:00:00 2001 From: hgfell683 <107510770+hgfell683@users.noreply.github.com> Date: Tue, 4 Feb 2025 13:50:34 -0500 Subject: [PATCH 1/4] SERXIONE-6937: SystemServices Crash Reason for change: Add a try/catch within getTerritory Test Procedure: Risks: low Priority: P1 Signed-off-by:Hayden Gfeller --- SystemServices/SystemServices.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/SystemServices/SystemServices.cpp b/SystemServices/SystemServices.cpp index 505b9c9640..02115311d9 100644 --- a/SystemServices/SystemServices.cpp +++ b/SystemServices/SystemServices.cpp @@ -2700,9 +2700,15 @@ namespace WPEFramework { bool resp = true; m_strTerritory = ""; m_strRegion = ""; - resp = readTerritoryFromFile(); - response["territory"] = m_strTerritory; - response["region"] = m_strRegion; + try{ + resp = readTerritoryFromFile(); + response["territory"] = m_strTerritory; + response["region"] = m_strRegion; + } + catch(...){ + LOGERR("Exception caught while reading territory file"); + resp = false; + } returnResponse(resp); } From 068869b2eacc0ebcc7c31a0db173b0abb8c6b40c Mon Sep 17 00:00:00 2001 From: hgfell683 <107510770+hgfell683@users.noreply.github.com> Date: Wed, 5 Feb 2025 10:49:49 -0500 Subject: [PATCH 2/4] SERXIONE-6937: SystemServices Crash Reason for change: Add a try/catch within getTerritory Test Procedure: Risks: low Priority: P1 Signed-off-by:Hayden Gfeller --- SystemServices/SystemServices.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SystemServices/SystemServices.cpp b/SystemServices/SystemServices.cpp index 02115311d9..5cba532354 100644 --- a/SystemServices/SystemServices.cpp +++ b/SystemServices/SystemServices.cpp @@ -2708,6 +2708,8 @@ namespace WPEFramework { catch(...){ LOGERR("Exception caught while reading territory file"); resp = false; + response["territory"] = ""; + response["region"] = ""; } returnResponse(resp); } From c99c0cbc1be67b8dc01966b9271f315a2006a934 Mon Sep 17 00:00:00 2001 From: hgfell683 <107510770+hgfell683@users.noreply.github.com> Date: Wed, 5 Feb 2025 11:35:49 -0500 Subject: [PATCH 3/4] SERXIONE-6937: SystemServices Crash Reason for change: Add a try/catch within getTerritory Test Procedure: Risks: low Priority: P1 Signed-off-by:Hayden Gfeller --- SystemServices/SystemServices.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/SystemServices/SystemServices.cpp b/SystemServices/SystemServices.cpp index 5cba532354..feaa7868fc 100644 --- a/SystemServices/SystemServices.cpp +++ b/SystemServices/SystemServices.cpp @@ -2700,24 +2700,17 @@ namespace WPEFramework { bool resp = true; m_strTerritory = ""; m_strRegion = ""; - try{ - resp = readTerritoryFromFile(); - response["territory"] = m_strTerritory; - response["region"] = m_strRegion; - } - catch(...){ - LOGERR("Exception caught while reading territory file"); - resp = false; - response["territory"] = ""; - response["region"] = ""; - } + resp = readTerritoryFromFile(); + response["territory"] = m_strTerritory; + response["region"] = m_strRegion; returnResponse(resp); } bool SystemServices::readTerritoryFromFile() { bool retValue = true; - if(Utils::fileExists(TERRITORYFILE)){ + try{ + if(Utils::fileExists(TERRITORYFILE)){ ifstream inFile(TERRITORYFILE); string str; getline (inFile, str); @@ -2750,9 +2743,16 @@ namespace WPEFramework { } inFile.close(); - }else{ - LOGERR("Territory is not set"); - } + }else{ + LOGERR("Territory is not set"); + } + } + catch(...){ + LOGERR("Exception caught while reading territory file"); + retValue = false; + m_strTerritory = ""; + m_strRegion = ""; + } return retValue; } From f6cdbd1ca61a75658414980138455929c33576a1 Mon Sep 17 00:00:00 2001 From: hgfell683 <107510770+hgfell683@users.noreply.github.com> Date: Thu, 13 Feb 2025 09:28:42 -0500 Subject: [PATCH 4/4] SERXIONE-6937: SystemServices Crash Reason for change: Add a try/catch within getTerritory Test Procedure: Risks: low Priority: P1 Signed-off-by:Hayden Gfeller --- SystemServices/SystemServices.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SystemServices/SystemServices.cpp b/SystemServices/SystemServices.cpp index feaa7868fc..6bf5d3b555 100644 --- a/SystemServices/SystemServices.cpp +++ b/SystemServices/SystemServices.cpp @@ -2751,7 +2751,7 @@ namespace WPEFramework { LOGERR("Exception caught while reading territory file"); retValue = false; m_strTerritory = ""; - m_strRegion = ""; + m_strRegion = ""; } return retValue; }