1 files changed, 4 insertions, 3 deletions
diff --git a/user_channel/user_mgmt.cpp b/user_channel/user_mgmt.cpp
index add7ee2..102f990 100644
--- a/user_channel/user_mgmt.cpp
+++ b/user_channel/user_mgmt.cpp
@@ -197,12 +197,13 @@ UserAccess& getUserAccessObject()
 
 int getUserNameFromPath(const std::string& path, std::string& userName)
 {
-    static size_t pos = strlen(userObjBasePath) + 1;
-    if (path.find(userObjBasePath) == std::string::npos)
+    constexpr size_t length = strlen(userObjBasePath);
+    if (((length + 1) >= path.size()) ||
+        path.compare(0, length, userObjBasePath))
     {
         return -EINVAL;
     }
-    userName.assign(path, pos, path.size());
+    userName.assign(path, length + 1, path.size());
     return 0;
 }