Merge pull request rdkcentral#6143 from hgfell683/main

SERXIONE-6937: SystemServices Crash

Author: apatel859

SystemServices/CHANGELOG.md

@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [3.4.4] - 2025-05-28
+### Security
+- Added catch to handle crash when reading territory
+
 ## [3.4.3] - 2025-01-02
 ### Security
 - Resolved security vulnerabilities

SystemServices/SystemServices.cpp

@@ -67,7 +67,7 @@ using namespace std;
 
 #define API_VERSION_NUMBER_MAJOR 3
 #define API_VERSION_NUMBER_MINOR 4
-#define API_VERSION_NUMBER_PATCH 3
+#define API_VERSION_NUMBER_PATCH 4
 
 #define MAX_REBOOT_DELAY 86400 /* 24Hr = 86400 sec */
 #define TR181_FW_DELAY_REBOOT "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.AutoReboot.fwDelayReboot"
@@ -2711,7 +2711,8 @@ namespace WPEFramework {
 	bool SystemServices::readTerritoryFromFile()
 	{
 		bool retValue = true;
-		if(Utils::fileExists(TERRITORYFILE)){
+        try{
+		    if(Utils::fileExists(TERRITORYFILE)){
 			ifstream inFile(TERRITORYFILE);
 			string str;
 			getline (inFile, str);
@@ -2744,9 +2745,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;
 	}